Kaydet (Commit) cecef392 authored tarafından Florent Xicluna's avatar Florent Xicluna

#2777: Handle fds more carefully to try to fix some x86-Linux failures (namely,…

#2777: Handle fds more carefully to try to fix some x86-Linux failures (namely, neal bot and twisted bot).
üst 20d7f6e8
...@@ -651,7 +651,10 @@ class POSIXProcessTestCase(unittest.TestCase): ...@@ -651,7 +651,10 @@ class POSIXProcessTestCase(unittest.TestCase):
self.assertEqual(rc, 47) self.assertEqual(rc, 47)
def test_send_signal(self): def test_send_signal(self):
p = subprocess.Popen([sys.executable, "-c", "input()"]) # Do not inherit file handles from the parent.
# It should fix failures on some platforms.
p = subprocess.Popen([sys.executable, "-c", "input()"], close_fds=True,
stdin=subprocess.PIPE, stderr=subprocess.PIPE)
# Let the process initialize correctly (Issue #3137) # Let the process initialize correctly (Issue #3137)
time.sleep(0.1) time.sleep(0.1)
...@@ -672,14 +675,14 @@ class POSIXProcessTestCase(unittest.TestCase): ...@@ -672,14 +675,14 @@ class POSIXProcessTestCase(unittest.TestCase):
def test_kill(self): def test_kill(self):
p = subprocess.Popen([sys.executable, "-c", "input()"]) p = subprocess.Popen([sys.executable, "-c", "input()"])
self.assertIs(p.poll(), None) self.assertIsNone(p.poll())
p.kill() p.kill()
self.assertEqual(p.wait(), -signal.SIGKILL) self.assertEqual(p.wait(), -signal.SIGKILL)
def test_terminate(self): def test_terminate(self):
p = subprocess.Popen([sys.executable, "-c", "input()"]) p = subprocess.Popen([sys.executable, "-c", "input()"])
self.assertIs(p.poll(), None) self.assertIsNone(p.poll())
p.terminate() p.terminate()
self.assertEqual(p.wait(), -signal.SIGTERM) self.assertEqual(p.wait(), -signal.SIGTERM)
......
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