From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 8 Dec 2009 19:46:38 +0000 (+0000)
Subject: Make test_pipes a little bit more robust.
X-Git-Tag: v2.7a2~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29dcdabf40f7642c96169ede9040d50a10926832;p=python

Make test_pipes a little bit more robust.
---

diff --git a/Lib/test/test_pipes.py b/Lib/test/test_pipes.py
index 052615961e..d1053e8ae1 100644
--- a/Lib/test/test_pipes.py
+++ b/Lib/test/test_pipes.py
@@ -2,7 +2,7 @@ import pipes
 import os
 import string
 import unittest
-from test.test_support import TESTFN, run_unittest, unlink
+from test.test_support import TESTFN, run_unittest, unlink, reap_children
 
 if os.name != 'posix':
     raise unittest.SkipTest('pipes module only works on posix')
@@ -36,7 +36,8 @@ class SimplePipeTests(unittest.TestCase):
         file(TESTFN, 'w').write('hello world #2')
         t = pipes.Template()
         t.append(s_command + ' < $IN', pipes.FILEIN_STDOUT)
-        self.assertEqual(t.open(TESTFN, 'r').read(), 'HELLO WORLD #2')
+        with t.open(TESTFN, 'r') as f:
+            self.assertEqual(f.read(), 'HELLO WORLD #2')
 
     def testEmptyPipeline1(self):
         # copy through empty pipe
@@ -52,7 +53,8 @@ class SimplePipeTests(unittest.TestCase):
         d = 'empty pipeline test READ'
         file(TESTFN, 'w').write(d)
         t=pipes.Template()
-        self.assertEqual(t.open(TESTFN, 'r').read(), d)
+        with t.open(TESTFN, 'r') as f:
+            self.assertEqual(f.read(), d)
 
     def testEmptyPipeline3(self):
         # write through empty pipe
@@ -185,6 +187,7 @@ class SimplePipeTests(unittest.TestCase):
 
 def test_main():
     run_unittest(SimplePipeTests)
+    reap_children()
 
 if __name__ == "__main__":
     test_main()