summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2015-07-12 16:53:28 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2015-07-12 16:53:28 +0200
commitd2d3abc4ba5604c8b544572e9922cb1ad8dfd61b (patch)
tree9c8b7f6a9660077f68f665f5bec519ca9cabd1f2
parent30d78447eac3cdf739cfead6744a4755dc12efc5 (diff)
downloadpsutil-d2d3abc4ba5604c8b544572e9922cb1ad8dfd61b.tar.gz
try to fix time-bound failure on appveyor
-rw-r--r--test/test_psutil.py24
1 files changed, 18 insertions, 6 deletions
diff --git a/test/test_psutil.py b/test/test_psutil.py
index 0913567a..8562bc0a 100644
--- a/test/test_psutil.py
+++ b/test/test_psutil.py
@@ -601,10 +601,16 @@ class TestSystemAPIs(unittest.TestCase):
for p in alive:
self.assertFalse(hasattr(p, 'returncode'))
+ @retry_before_failing(30)
+ def test(procs, callback):
+ gone, alive = psutil.wait_procs(procs, timeout=0.03,
+ callback=callback)
+ self.assertEqual(len(gone), 1)
+ self.assertEqual(len(alive), 2)
+ return gone, alive
+
sproc3.terminate()
- gone, alive = psutil.wait_procs(procs, timeout=0.03, callback=callback)
- self.assertEqual(len(gone), 1)
- self.assertEqual(len(alive), 2)
+ gone, alive = test(procs, callback)
self.assertIn(sproc3.pid, [x.pid for x in gone])
if POSIX:
self.assertEqual(gone.pop().returncode, signal.SIGTERM)
@@ -614,11 +620,17 @@ class TestSystemAPIs(unittest.TestCase):
for p in alive:
self.assertFalse(hasattr(p, 'returncode'))
+ @retry_before_failing(30)
+ def test(procs, callback):
+ gone, alive = psutil.wait_procs(procs, timeout=0.03,
+ callback=callback)
+ self.assertEqual(len(gone), 3)
+ self.assertEqual(len(alive), 0)
+ return gone, alive
+
sproc1.terminate()
sproc2.terminate()
- gone, alive = psutil.wait_procs(procs, timeout=0.03, callback=callback)
- self.assertEqual(len(gone), 3)
- self.assertEqual(len(alive), 0)
+ gone, alive = test(procs, callback)
self.assertEqual(set(l), set([sproc1.pid, sproc2.pid, sproc3.pid]))
for p in gone:
self.assertTrue(hasattr(p, 'returncode'))