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.
........

diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index ff9b106e1c47f5d21ee3b1335c38f8be57fcf3fa..8d1bb59453aa4768ebc75d55e779b2085ef7f8ce 100644 (file)
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -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

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index 66c4de332473e2ac383484fec914ae42130dd985..e74ecd57469a11e128971e604389fff62bd1d314 100644 (file)
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -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"