Changeset 391 for python/trunk/Lib/test/test_popen2.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_popen2.py (modified) (7 diffs)

python/trunk/Lib/test/test_popen2.py

@@ -13 +13 @@
 import popen2
 
-from test.test_support import TestSkipped, run_unittest, reap_children
+from test.test_support import run_unittest, reap_children
 
 if sys.platform[:4] == 'beos' or sys.platform[:6] == 'atheos':
@@ -19 +19 @@
     #  to avoid mixing "posix" fork & exec with native threads, and
     #  they may be right about that after all.
-    raise TestSkipped("popen2() doesn't work on " + sys.platform)
+    raise unittest.SkipTest("popen2() doesn't work on " + sys.platform)
 
 # if we don't have os.popen, check that
@@ -51 +51 @@
             inst.wait()
         popen2._cleanup()
-        self.assertFalse(popen2._active, "_active not empty")
+        self.assertFalse(popen2._active, "popen2._active not empty")
+        # The os.popen*() API delegates to the subprocess module (on Unix)
+        import subprocess
+        for inst in subprocess._active:
+            inst.wait()
+        subprocess._cleanup()
+        self.assertFalse(subprocess._active, "subprocess._active not empty")
         reap_children()
 
@@ -58 +64 @@
         w.close()
         got = r.read()
-        self.assertEquals(expected_out, got.strip(), "wrote %r read %r" %
-                          (teststr, got))
+        self.assertEqual(expected_out, got.strip(), "wrote %r read %r" %
+                         (teststr, got))
 
         if e is not None:
@@ -85 +91 @@
             w, r = os.popen2(["echo", self.teststr])
             got = r.read()
-            self.assertEquals(got, self.teststr + "\n")
+            self.assertEqual(got, self.teststr + "\n")
 
         w, r = os.popen2(self.cmd)
@@ -98 +104 @@
             w, r, e = os.popen3(["echo", self.teststr])
             got = r.read()
-            self.assertEquals(got, self.teststr + "\n")
+            self.assertEqual(got, self.teststr + "\n")
             got = e.read()
             self.assertFalse(got, "unexpected %r on stderr" % got)
@@ -112 +118 @@
             w, r = os.popen4(["echo", self.teststr])
             got = r.read()
-            self.assertEquals(got, self.teststr + "\n")
+            self.assertEqual(got, self.teststr + "\n")
 
         w, r = os.popen4(self.cmd)