[3.10] bpo-46425: Fix direct invocation of multiple test modules (GH-30666) (GH-30699)

diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index 9e15ecf3aae29924a07baffd0166502935c97b3c..33f0c939325f5320ff5e9970f4b2571bb4ffe9ca 100644 (file)
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -3,7 +3,6 @@ import contextlib
 import filecmp
 import importlib.util
 import io
-import itertools
 import os
 import pathlib
 import py_compile
@@ -29,9 +28,8 @@ except NotImplementedError:
 from test import support
 from test.support import os_helper
 from test.support import script_helper
-
-from .test_py_compile import without_source_date_epoch
-from .test_py_compile import SourceDateEpochTestMeta
+from test.test_py_compile import without_source_date_epoch
+from test.test_py_compile import SourceDateEpochTestMeta
 
 
 def get_pyc(script, opt):

diff --git a/Lib/test/test_distutils.py b/Lib/test/test_distutils.py
index 4b40af0213234e1a3bf90d06789dc89a448e93da..d82d2b6423433eeb69e05469b0d4b18fbe423e92 100644 (file)
--- a/Lib/test/test_distutils.py
+++ b/Lib/test/test_distutils.py
@@ -5,7 +5,7 @@ the test_suite() function there returns a test suite that's ready to
 be run.
 """
 
-import warnings
+import unittest
 from test import support
 from test.support import warnings_helper
 

diff --git a/Lib/test/test_dtrace.py b/Lib/test/test_dtrace.py
index 3957077f5d612349070fa5440976d7282107828c..8a436ad123b80f7e8d6355ffaf6adb90212fa8c3 100644 (file)
--- a/Lib/test/test_dtrace.py
+++ b/Lib/test/test_dtrace.py
@@ -170,4 +170,4 @@ class SystemTapOptimizedTests(TraceTests, unittest.TestCase):
 
 
 if __name__ == '__main__':
-    test_main()
+    unittest.main()

diff --git a/Lib/test/test_zipfile64.py b/Lib/test/test_zipfile64.py
index 810fdedef39dddbe46fae8c24b71be217b82db37..0947013afbc6ed117578e217b0dff22f2fe8ec87 100644 (file)
--- a/Lib/test/test_zipfile64.py
+++ b/Lib/test/test_zipfile64.py
@@ -18,8 +18,9 @@ import sys
 from tempfile import TemporaryFile
 
 from test.support import os_helper
-from test.support import TESTFN, requires_zlib
+from test.support import requires_zlib
 
+TESTFN = os_helper.TESTFN
 TESTFN2 = TESTFN + "2"
 
 # How much time in seconds can pass before we print a 'Still working' message.

diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_program.py
index 4746d71e0b60393ead8a114a724a66a94d979e48..b7fbbc1e7baddd4b8c2e60f6651b9d970330d67b 100644 (file)
--- a/Lib/unittest/test/test_program.py
+++ b/Lib/unittest/test/test_program.py
@@ -6,7 +6,7 @@ import subprocess
 from test import support
 import unittest
 import unittest.test
-from .test_result import BufferedWriter
+from unittest.test.test_result import BufferedWriter
 
 
 class Test_TestProgram(unittest.TestCase):