summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-10-06 16:43:33 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2017-10-06 16:43:33 +0200
commit632dac16e9a3d8cb79270dabe7033143b0b112ba (patch)
tree31d732f7ba72b200d47d50f18213183bda926d79
parentad4b22f51b064c4dcc07f3f3c019a46c63e35119 (diff)
downloadpsutil-632dac16e9a3d8cb79270dabe7033143b0b112ba.tar.gz
work around travis failure
-rwxr-xr-xpsutil/tests/test_process.py21
1 files changed, 3 insertions, 18 deletions
diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
index 9f9ff17b..45e79bbb 100755
--- a/psutil/tests/test_process.py
+++ b/psutil/tests/test_process.py
@@ -866,25 +866,10 @@ class TestProcess(unittest.TestCase):
self.assertEqual(len(initial), len(set(initial)))
all_cpus = list(range(len(psutil.cpu_percent(percpu=True))))
- # setting on travis doesn't seem to work (always return all
- # CPUs on get):
- # AssertionError: Lists differ: [0, 1, 2, 3, 4, 5, 6, ... != [0]
- # XXX
- print("cpu_count = %s" % psutil.cpu_count())
- print("all_cpus = %s" % all_cpus)
- print("initial affinity = %s" % initial)
+ # Work around travis failure:
+ # https://travis-ci.org/giampaolo/psutil/builds/284173194
for n in all_cpus if not TRAVIS else initial:
- print(n)
- if hasattr(os, "sched_setaffinity"):
- os.sched_setaffinity(os.getpid(), [n])
- try:
- p.cpu_affinity([n])
- except ValueError as err:
- if TRAVIS and LINUX and "not eligible" in str(err):
- # https://travis-ci.org/giampaolo/psutil/jobs/279890461
- continue
- else:
- raise
+ p.cpu_affinity([n])
self.assertEqual(p.cpu_affinity(), [n])
if hasattr(os, "sched_getaffinity"):
self.assertEqual(p.cpu_affinity(),