[Python-checkins] r52545 - in python/trunk/Lib/test: output/test_openpty test_openpty.py
georg.brandl
python-checkins at python.org
Sun Oct 29 21:31:18 CET 2006
Author: georg.brandl
Date: Sun Oct 29 21:31:17 2006
New Revision: 52545
Removed:
python/trunk/Lib/test/output/test_openpty
Modified:
python/trunk/Lib/test/test_openpty.py
Log:
Convert test_openpty to unittest.
Deleted: /python/trunk/Lib/test/output/test_openpty
==============================================================================
--- /python/trunk/Lib/test/output/test_openpty Sun Oct 29 21:31:17 2006
+++ (empty file)
@@ -1,2 +0,0 @@
-test_openpty
-Ping!
Modified: python/trunk/Lib/test/test_openpty.py
==============================================================================
--- python/trunk/Lib/test/test_openpty.py (original)
+++ python/trunk/Lib/test/test_openpty.py Sun Oct 29 21:31:17 2006
@@ -1,19 +1,23 @@
# Test to see if openpty works. (But don't worry if it isn't available.)
-import os
-from test.test_support import verbose, TestFailed, TestSkipped
+import os, unittest
+from test.test_support import run_unittest, TestSkipped
-try:
- if verbose:
- print "Calling os.openpty()"
- master, slave = os.openpty()
- if verbose:
- print "(master, slave) = (%d, %d)"%(master, slave)
-except AttributeError:
- raise TestSkipped, "No openpty() available."
+class OpenptyTest(unittest.TestCase):
+ def test(self):
+ try:
+ master, slave = os.openpty()
+ except AttributeError:
+ raise TestSkipped, "No openpty() available."
-if not os.isatty(slave):
- raise TestFailed, "Slave-end of pty is not a terminal."
+ if not os.isatty(slave):
+ self.fail("Slave-end of pty is not a terminal.")
-os.write(slave, 'Ping!')
-print os.read(master, 1024)
+ os.write(slave, 'Ping!')
+ self.assertEqual(os.read(master, 1024), 'Ping!')
+
+def test_main():
+ run_unittest(OpenptyTest)
+
+if __name__ == '__main__':
+ test_main()
More information about the Python-checkins
mailing list