summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-02-05 22:34:37 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2017-02-05 22:34:37 +0100
commitd5ac3e11c5359a3ded7ce6ef49f6e2127d3bdb33 (patch)
tree4605a3e191b7e5c04fd48ecbf8cce70e6b1ab5ac
parent561f32a476e7e68dc8db46850b1a2e18d18f4385 (diff)
downloadpsutil-d5ac3e11c5359a3ded7ce6ef49f6e2127d3bdb33.tar.gz
fix linux test failures
-rwxr-xr-xpsutil/tests/test_linux.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
index 5db4c309..b00b4965 100755
--- a/psutil/tests/test_linux.py
+++ b/psutil/tests/test_linux.py
@@ -467,8 +467,9 @@ class TestSystemCPU(unittest.TestCase):
def test_cpu_count_logical_w_sysdev_cpu_online(self):
with open("/sys/devices/system/cpu/online") as f:
value = f.read().strip()
- value = int(value.split('-')[1]) + 1
- self.assertEqual(psutil.cpu_count(), value)
+ if "-" in str(value):
+ value = int(value.split('-')[1]) + 1
+ self.assertEqual(psutil.cpu_count(), value)
@unittest.skipUnless(os.path.exists("/sys/devices/system/cpu"),
"/sys/devices/system/cpu does not exist")
@@ -1407,14 +1408,19 @@ class TestProcessAgainstStatus(unittest.TestCase):
def test_cpu_affinity(self):
value = self.read_status_file("Cpus_allowed_list:")
- min_, max_ = map(int, value.split('-'))
- self.assertEqual(
- self.proc.cpu_affinity(), list(range(min_, max_ + 1)))
+ if '-' in str(value):
+ min_, max_ = map(int, value.split('-'))
+ self.assertEqual(
+ self.proc.cpu_affinity(), list(range(min_, max_ + 1)))
def test_cpu_affinity_eligible_cpus(self):
+ value = self.read_status_file("Cpus_allowed_list:")
with mock.patch("psutil._pslinux.per_cpu_times") as m:
self.proc._proc._get_eligible_cpus()
- assert not m.called
+ if '-' in str(value):
+ assert not m.called
+ else:
+ assert m.called
if __name__ == '__main__':