diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index edfaa9a01cf..f970404b95a 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 73203b67733..857aeb1acca 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 6d0a36de708..c5e968fde44 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 b1a9caf9acf..ff9b106e1c4 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 3be7c97b6e6..66c4de33247 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 3a3d63555f3..028dcb49aaf 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 2eca27b2b06..80316b36842 100644 --- a/Lib/test/test_tk.py +++ b/Lib/test/test_tk.py @@ -1,11 +1,12 @@ -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 +from tkinter.test import runtktests +import unittest + + import tkinter try: