[Python-checkins] r71792 - in python/branches/py3k: Lib/test/test_posix.py Lib/test/test_pty.py

[r.david.murray]

Author: r.david.murray
Date: Wed Apr 22 04:24:39 2009
New Revision: 71792

Log:
Merged revisions 71785 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71785 | r.david.murray | 2009-04-21 09:06:04 -0400 (Tue, 21 Apr 2009) | 4 lines
  
  Restore skips of posix and pty tests on Windows by calling the
  test_support.import_module on the appropriate modules
  before any other imports.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_posix.py
   python/branches/py3k/Lib/test/test_pty.py

Modified: python/branches/py3k/Lib/test/test_posix.py
==============================================================================
--- python/branches/py3k/Lib/test/test_posix.py	(original)
+++ python/branches/py3k/Lib/test/test_posix.py	Wed Apr 22 04:24:39 2009
@@ -1,7 +1,9 @@
 "Test posix functions"
 
 from test import support
-posix = support.import_module('posix') #skip if not supported
+
+# Skip these tests if there is no posix module.
+posix = support.import_module('posix')
 
 import time
 import os

Modified: python/branches/py3k/Lib/test/test_pty.py
==============================================================================
--- python/branches/py3k/Lib/test/test_pty.py	(original)
+++ python/branches/py3k/Lib/test/test_pty.py	Wed Apr 22 04:24:39 2009
@@ -1,11 +1,14 @@
-from test import support
-pty = support.import_module("pty") #skip if not supported
+from test.support import verbose, run_unittest, import_module
+
+#Skip these tests if either fcntl or termios is not available
+fcntl = import_module('fcntl')
+import_module('termios')
+
 import errno
-import fcntl
+import pty
 import os
 import sys
 import signal
-from test.support import verbose, run_unittest
 import unittest
 
 TEST_STRING_1 = b"I wish to buy a fish license.\n"