Enable extra testing now that os.isatty() is in. (Also tests os.isatty ;P)

diff --git a/Lib/test/test_openpty.py b/Lib/test/test_openpty.py
index cd939c69b473de41039f56bdb880aba1c62fa99d..1202845d9a22e433dcc14df5658e36f1f8e7288f 100644 (file)
--- a/Lib/test/test_openpty.py
+++ b/Lib/test/test_openpty.py
@@ -12,11 +12,10 @@ try:
 except AttributeError:
     raise ImportError, "No openpty() available."
 
-## # Please uncomment these if os.isatty() is added.
-## if not os.isatty(master):
-##     raise TestFailed, "Master-end of pty is not a terminal."
-## if not os.isatty(slave):
-##     raise TestFailed, "Slave-end of pty is not a terminal."
+if not os.isatty(master):
+    raise TestFailed, "Master-end of pty is not a terminal."
+if not os.isatty(slave):
+    raise TestFailed, "Slave-end of pty is not a terminal."
 
 os.write(slave, 'Ping!')
 print os.read(master, 1024)

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index 389d2a74e3e5613b15c7ac5812bb7bec7f5cd0b3..5551cd119e957cdfc991df12a957a646c0a3bb9f 100644 (file)
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -27,11 +27,10 @@ except OSError:
     # " An optional feature could not be imported " ... ?
     raise ImportError, "Pseudo-terminals (seemingly) not functional."
 
-## # Please uncomment these if os.isatty() is added.
-## if not os.isatty(master_fd):
-##     raise TestFailed, "master_fd is not a tty"
-## if not os.isatty(slave_fd):
-##     raise TestFailed, "slave_fd is not a tty"
+if not os.isatty(master_fd):
+    raise TestFailed, "master_fd is not a tty"
+if not os.isatty(slave_fd):
+    raise TestFailed, "slave_fd is not a tty"
 
 debug("Writing to slave_fd")
 os.write(slave_fd, TEST_STRING_1) # should check return value