diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-03-06 17:50:16 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-03-06 17:50:16 +0100 |
| commit | ffe8a9d280c397e8fd46eb1422c2838179cfb5d9 (patch) | |
| tree | ef94c591ddfb06b0a6db4f08e69c04dbdd9b76ff | |
| parent | 52501180c85fd3cde4101f9b1b40015e81649d34 (diff) | |
| download | psutil-ffe8a9d280c397e8fd46eb1422c2838179cfb5d9.tar.gz | |
test: avoid failing at import time
| -rw-r--r-- | psutil/tests/__init__.py | 1 | ||||
| -rwxr-xr-x | psutil/tests/test_misc.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index 65c5aa4e..74b0c969 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -165,7 +165,6 @@ HAS_CPU_AFFINITY = hasattr(psutil.Process, "cpu_affinity") HAS_CPU_FREQ = hasattr(psutil, "cpu_freq") HAS_ENVIRON = hasattr(psutil.Process, "environ") HAS_IONICE = hasattr(psutil.Process, "ionice") -HAS_MEMORY_FULL_INFO = 'uss' in psutil.Process().memory_full_info()._fields HAS_MEMORY_MAPS = hasattr(psutil.Process, "memory_maps") HAS_NET_IO_COUNTERS = hasattr(psutil, "net_io_counters") HAS_PROC_CPU_NUM = hasattr(psutil.Process, "cpu_num") diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py index 721751a8..04b45948 100755 --- a/psutil/tests/test_misc.py +++ b/psutil/tests/test_misc.py @@ -42,7 +42,6 @@ from psutil.tests import get_free_port from psutil.tests import get_test_subprocess from psutil.tests import HAS_BATTERY from psutil.tests import HAS_CONNECTIONS_UNIX -from psutil.tests import HAS_MEMORY_FULL_INFO from psutil.tests import HAS_MEMORY_MAPS from psutil.tests import HAS_NET_IO_COUNTERS from psutil.tests import HAS_SENSORS_BATTERY @@ -736,8 +735,9 @@ class TestScripts(unittest.TestCase): def test_pmap(self): self.assert_stdout('pmap.py', str(os.getpid())) - @unittest.skipIf(not HAS_MEMORY_FULL_INFO, "not supported") def test_procsmem(self): + if 'uss' not in psutil.Process().memory_full_info()._fields: + raise self.skipTest("not supported") self.assert_stdout('procsmem.py', stderr=DEVNULL) def test_killall(self): |