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

python/trunk/Lib/test/test_openpty.py

@@ -2 +2 @@
 
 import os, unittest
-from test.test_support import run_unittest, TestSkipped
+from test.test_support import run_unittest
 
 if not hasattr(os, "openpty"):
-    raise TestSkipped, "No openpty() available."
+    raise unittest.SkipTest, "No openpty() available."
 
 
@@ -11 +11 @@
     def test(self):
         master, slave = os.openpty()
+        self.addCleanup(os.close, master)
+        self.addCleanup(os.close, slave)
         if not os.isatty(slave):
             self.fail("Slave-end of pty is not a terminal.")