Commit d6935631 authored by Florent Xicluna's avatar Florent Xicluna

Let's use assertIsNone / assertIsNotNone. It's hype.

parent 80e0e2d2
...@@ -655,17 +655,16 @@ class POSIXProcessTestCase(unittest.TestCase): ...@@ -655,17 +655,16 @@ class POSIXProcessTestCase(unittest.TestCase):
# Let the process initialize correctly (Issue #3137) # Let the process initialize correctly (Issue #3137)
time.sleep(0.1) time.sleep(0.1)
self.assertIs(p.poll(), None) self.assertIsNone(p.poll())
count, maxcount = 0, 3 count, maxcount = 0, 3
# Retry if the process do not receive the SIGINT signal. # Retry if the process do not receive the SIGINT signal.
while count < maxcount and p.poll() is None: while count < maxcount and p.poll() is None:
p.send_signal(signal.SIGINT) p.send_signal(signal.SIGINT)
time.sleep(0.1) time.sleep(0.1)
count += 1 count += 1
if p.poll() is None: self.assertIsNotNone(p.poll(), "the subprocess did not receive "
raise test_support.TestFailed("the subprocess did not receive " "the signal SIGINT")
"the signal SIGINT") if count > 1:
elif count > 1:
print >>sys.stderr, ("p.send_signal(SIGINT) succeeded " print >>sys.stderr, ("p.send_signal(SIGINT) succeeded "
"after {} attempts".format(count)) "after {} attempts".format(count))
self.assertNotEqual(p.wait(), 0) self.assertNotEqual(p.wait(), 0)
...@@ -824,6 +823,7 @@ def test_main(): ...@@ -824,6 +823,7 @@ def test_main():
ProcessTestCaseNoPoll, ProcessTestCaseNoPoll,
HelperFunctionTests) HelperFunctionTests)
unit_tests = ( POSIXProcessTestCase,)
test_support.run_unittest(*unit_tests) test_support.run_unittest(*unit_tests)
test_support.reap_children() test_support.reap_children()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment