summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2010-11-02 04:01:17 (GMT)
committerBrian Curtin <brian.curtin@gmail.com>2010-11-02 04:01:17 (GMT)
commite509ff4d5cbef58d270f0e6784424d408a0b9572 (patch)
treecb5fe8cc04595a0715f01e374d1f181390a05e7a
parent04d40ee7504e8f6832b017eaf23ec0ee802b99f8 (diff)
downloadcpython-e509ff4d5cbef58d270f0e6784424d408a0b9572.zip
cpython-e509ff4d5cbef58d270f0e6784424d408a0b9572.tar.gz
cpython-e509ff4d5cbef58d270f0e6784424d408a0b9572.tar.bz2
Merged revisions 86107 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86107 | brian.curtin | 2010-11-01 22:59:09 -0500 (Mon, 01 Nov 2010) | 2 lines Clean up ResourceWarnings. Explictly close stdout from the subprocess. ........
-rw-r--r--Lib/test/test_threading.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index a4a6ed6..f691336 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -416,6 +416,7 @@ class ThreadJoinOnShutdown(unittest.TestCase):
p = subprocess.Popen([sys.executable, "-c", script], stdout=subprocess.PIPE)
rc = p.wait()
data = p.stdout.read().decode().replace('\r', '')
+ p.stdout.close()
self.assertEqual(data, "end of main\nend of thread\n")
self.assertFalse(rc == 2, "interpreter was blocked")
self.assertTrue(rc == 0, "Unexpected error")