[Python-checkins] r86186 - in python/branches/release27-maint: Lib/test/test_subprocess.py

Fri Nov 5 05:09:09 CET 2010

Author: brian.curtin
Date: Fri Nov 5 05:09:09 2010
New Revision: 86186
Log:
Merged revisions 86185 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r86185 | brian.curtin | 2010年11月04日 22:58:52 -0500 (2010年11月04日) | 2 lines
 
 Add cleanups to stdout/stderr pipes to remove ResourceWarnings.
........
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/Lib/test/test_subprocess.py
Modified: python/branches/release27-maint/Lib/test/test_subprocess.py
==============================================================================

--- python/branches/release27-maint/Lib/test/test_subprocess.py	(original)
+++ python/branches/release27-maint/Lib/test/test_subprocess.py	Fri Nov 5 05:09:09 2010
@@ -117,6 +117,8 @@
 # .stdin is None when not redirected
 p = subprocess.Popen([sys.executable, "-c", 'print "banana"'],
 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ self.addCleanup(p.stdout.close)
+ self.addCleanup(p.stderr.close)
 p.wait()
 self.assertEqual(p.stdin, None)
 
@@ -127,6 +129,8 @@
 'test of stdout in a different '
 'process ..."'],
 stdin=subprocess.PIPE, stderr=subprocess.PIPE)
+ self.addCleanup(p.stdin.close)
+ self.addCleanup(p.stderr.close)
 p.wait()
 self.assertEqual(p.stdout, None)
 
@@ -134,6 +138,8 @@
 # .stderr is None when not redirected
 p = subprocess.Popen([sys.executable, "-c", 'print "banana"'],
 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+ self.addCleanup(p.stdout.close)
+ self.addCleanup(p.stdin.close)
 p.wait()
 self.assertEqual(p.stderr, None)
 
@@ -194,6 +200,7 @@
 p = subprocess.Popen([sys.executable, "-c",
 'import sys; sys.stdout.write("orange")'],
 stdout=subprocess.PIPE)
+ self.addCleanup(p.stdout.close)
 self.assertEqual(p.stdout.read(), "orange")
 
 def test_stdout_filedes(self):
@@ -222,6 +229,7 @@
 p = subprocess.Popen([sys.executable, "-c",
 'import sys; sys.stderr.write("strawberry")'],
 stderr=subprocess.PIPE)
+ self.addCleanup(p.stderr.close)
 self.assertStderrEqual(p.stderr.read(), "strawberry")
 
 def test_stderr_filedes(self):
@@ -254,6 +262,7 @@
 'sys.stderr.write("orange")'],
 stdout=subprocess.PIPE,
 stderr=subprocess.STDOUT)
+ self.addCleanup(p.stdout.close)
 self.assertStderrEqual(p.stdout.read(), "appleorange")
 
 def test_stdout_stderr_file(self):
@@ -289,6 +298,7 @@
 'sys.stdout.write(os.getcwd())'],
 stdout=subprocess.PIPE,
 cwd=tmpdir)
+ self.addCleanup(p.stdout.close)
 normcase = os.path.normcase
 self.assertEqual(normcase(p.stdout.read()), normcase(tmpdir))
 
@@ -300,6 +310,7 @@
 'sys.stdout.write(os.getenv("FRUIT"))'],
 stdout=subprocess.PIPE,
 env=newenv)
+ self.addCleanup(p.stdout.close)
 self.assertEqual(p.stdout.read(), "orange")
 
 def test_communicate_stdin(self):
@@ -415,6 +426,7 @@
 'sys.stdout.write("\\nline6");'],
 stdout=subprocess.PIPE,
 universal_newlines=1)
+ self.addCleanup(p.stdout.close)
 stdout = p.stdout.read()
 if hasattr(file, 'newlines'):
 # Interpreter with universal newline support
@@ -639,6 +651,7 @@
 "sys.stdout.write(os.getenv('FRUIT'))"],
 stdout=subprocess.PIPE,
 preexec_fn=lambda: os.putenv("FRUIT", "apple"))
+ self.addCleanup(p.stdout.close)
 self.assertEqual(p.stdout.read(), "apple")
 
 def test_args_string(self):
@@ -672,6 +685,7 @@
 p = subprocess.Popen(["echo $FRUIT"], shell=1,
 stdout=subprocess.PIPE,
 env=newenv)
+ self.addCleanup(p.stdout.close)
 self.assertEqual(p.stdout.read().strip(), "apple")
 
 def test_shell_string(self):
@@ -681,6 +695,7 @@
 p = subprocess.Popen("echo $FRUIT", shell=1,
 stdout=subprocess.PIPE,
 env=newenv)
+ self.addCleanup(p.stdout.close)
 self.assertEqual(p.stdout.read().strip(), "apple")
 
 def test_call_string(self):
@@ -712,6 +727,7 @@
 for sh in shells:
 p = subprocess.Popen("echo 0ドル", executable=sh, shell=True,
 stdout=subprocess.PIPE)
+ self.addCleanup(p.stdout.close)
 self.assertEqual(p.stdout.read().strip(), sh)
 
 def _kill_process(self, method, *args):
