From 42a40c59a0bc94d29e5fd61cada2d8c0763211d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristj=C3=A1n=20Valur=20J=C3=B3nsson?=
 <kristjan@ccpgames.com>
Date: Wed, 1 Apr 2009 11:28:47 +0000
Subject: Allow skipping of regression tests not supported on windows.  This
 reduces noise in the regression test suite for py3k on Windows.

---
 Lib/test/regrtest.py      | 1 +
 Lib/test/test_dbm_gnu.py  | 3 ++-
 Lib/test/test_dbm_ndbm.py | 1 +
 Lib/test/test_posix.py    | 3 +--
 Lib/test/test_pty.py      | 3 ++-
 Lib/test/test_syslog.py   | 4 ++--
 Lib/test/test_tk.py       | 7 ++++---
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index edfaa9a..f970404 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -892,6 +892,7 @@ _expectations = {
         test_fork1
         test_epoll
         test_dbm_gnu
+        test_dbm_ndbm
         test_grp
         test_ioctl
         test_largefile
diff --git a/Lib/test/test_dbm_gnu.py b/Lib/test/test_dbm_gnu.py
index 73203b6..857aeb1 100755
--- a/Lib/test/test_dbm_gnu.py
+++ b/Lib/test/test_dbm_gnu.py
@@ -1,4 +1,5 @@
-import dbm.gnu as gdbm
+from test import support
+gdbm = support.import_module("dbm.gnu") #skip if not supported
 import unittest
 import os
 from test.support import verbose, TESTFN, run_unittest, unlink
diff --git a/Lib/test/test_dbm_ndbm.py b/Lib/test/test_dbm_ndbm.py
index 6d0a36d..c5e968f 100755
--- a/Lib/test/test_dbm_ndbm.py
+++ b/Lib/test/test_dbm_ndbm.py
@@ -1,4 +1,5 @@
 from test import support
+support.import_module("dbm.ndbm") #skip if not supported
 import unittest
 import os
 import random
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index b1a9caf..ff9b106 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -1,6 +1,7 @@
 "Test posix functions"
 
 from test import support
+posix = support.import_module('posix') #skip if not supported
 
 import time
 import os
@@ -9,8 +10,6 @@ import shutil
 import unittest
 import warnings
 
-posix = support.import_module('posix')
-
 warnings.filterwarnings('ignore', '.* potential security risk .*',
                         RuntimeWarning)
 
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index 3be7c97..66c4de3 100644
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -1,6 +1,7 @@
+from test import support
+pty = support.import_module("pty") #skip if not supported
 import errno
 import fcntl
-import pty
 import os
 import sys
 import signal
diff --git a/Lib/test/test_syslog.py b/Lib/test/test_syslog.py
index 3a3d635..028dcb4 100644
--- a/Lib/test/test_syslog.py
+++ b/Lib/test/test_syslog.py
@@ -1,7 +1,7 @@
 
-import syslog
-import unittest
 from test import support
+syslog = support.import_module("syslog") #skip if not supported
+import unittest
 
 # XXX(nnorwitz): This test sucks.  I don't know of a platform independent way
 # to verify that the messages were really logged.
diff --git a/Lib/test/test_tk.py b/Lib/test/test_tk.py
index 2eca27b..80316b3 100644
--- a/Lib/test/test_tk.py
+++ b/Lib/test/test_tk.py
@@ -1,10 +1,11 @@
+from test import support
+# Skip test if _tkinter wasn't built.
+support.import_module('_tkinter')
+
 import tkinter
 from tkinter.test import runtktests
-from test import support
 import unittest
 
-# Skip test if _tkinter wasn't built.
-support.import_module('_tkinter')
 
 import tkinter
 
-- 
cgit v0.12