Changeset 391 for python/trunk/Lib/test/test_popen.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_popen.py (modified) (2 diffs)

python/trunk/Lib/test/test_popen.py

@@ -15 +15 @@
 # We can then eval() the result of this, and see what each argv was.
 python = sys.executable
-if ' ' in python:
-    python = '"' + python + '"'     # quote embedded space for cmdline
 
 class PopenTest(unittest.TestCase):
     def _do_test_commandline(self, cmdline, expected):
         cmd = '%s -c "import sys;print sys.argv" %s' % (python, cmdline)
-        data = os.popen(cmd).read()
+        data = os.popen(cmd).read() + '\n'
         got = eval(data)[1:] # strip off argv[0]
         self.assertEqual(got, expected)
@@ -41 +39 @@
         test_support.reap_children()
 
+    def test_return_code(self):
+        self.assertEqual(os.popen("exit 0").close(), None)
+        if os.name == 'nt':
+            self.assertEqual(os.popen("exit 42").close(), 42)
+        else:
+            self.assertEqual(os.popen("exit 42").close(), 42 << 8)
+
 def test_main():
     test_support.run_unittest(PopenTest)