]> granicus.if.org Git - python/commitdiff
test_threading: use Popen.communicate() instead of .wait()
authorVictor Stinner <victor.stinner@haypocalc.com>
Wed, 5 Jan 2011 03:54:28 +0000 (03:54 +0000)
committerVictor Stinner <victor.stinner@haypocalc.com>
Wed, 5 Jan 2011 03:54:28 +0000 (03:54 +0000)
Popen.communicate() avoids deadlocks and close the pipes when done. This commit
fixes a ResourceWarning(unclosed pipe).

Lib/test/test_threading.py

index f3d5a4c89dee5c15ee10c00787992097d5b3712f..46d2f4723da7b6861dcc01d2259cb609f1e4fc0e 100644 (file)
@@ -512,9 +512,9 @@ class ThreadJoinOnShutdown(BaseTestCase):
     def assertScriptHasOutput(self, script, expected_output):
         p = subprocess.Popen([sys.executable, "-c", script],
                              stdout=subprocess.PIPE)
-        rc = p.wait()
-        data = p.stdout.read().decode().replace('\r', '')
-        self.assertEqual(rc, 0, "Unexpected error")
+        stdout, stderr = p.communicate()
+        data = stdout.decode().replace('\r', '')
+        self.assertEqual(p.returncode, 0, "Unexpected error")
         self.assertEqual(data, expected_output)
 
     @unittest.skipUnless(hasattr(os, 'fork'), "needs os.fork()")