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

sobolevn · sobolevn · commit a7a6daac205f · 2022-01-19T20:08:12.000+03:00
(cherry picked from commit 1292aa6) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
@@ -3,7 +3,6 @@
 import filecmp
 import importlib.util
 import io
-import itertools
 import os
 import pathlib
 import py_compile
@@ -29,9 +28,8 @@
 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
@@ -5,7 +5,7 @@
 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
@@ -170,4 +170,4 @@ class SystemTapOptimizedTests(TraceTests, unittest.TestCase):
 
 
 if __name__ == '__main__':
-    test_main()
+    unittest.main()
diff --git a/Lib/test/test_tools/test_freeze.py b/Lib/test/test_tools/test_freeze.py
@@ -0,0 +1,30 @@
+"""Sanity-check tests for the "freeze" tool."""
+
+import sys
+import textwrap
+import unittest
+
+from test import support
+from test.support import os_helper
+from test.test_tools import imports_under_tool, skip_if_missing
+
+skip_if_missing('freeze')
+with imports_under_tool('freeze', 'test'):
+    import freeze as helper
+
+
+@unittest.skipIf(sys.platform.startswith('win'), 'not supported on Windows')
+@support.skip_if_buildbot('not all buildbots have enough space')
+class TestFreeze(unittest.TestCase):
+
+    def test_freeze_simple_script(self):
+        script = textwrap.dedent("""
+            import sys
+            print('running...')
+            sys.exit(0)
+            """)
+        with os_helper.temp_dir() as outdir:
+            outdir, scriptfile, python = helper.prepare(script, outdir)
+            executable = helper.freeze(python, scriptfile, outdir)
+            text = helper.run(executable)
+        self.assertEqual(text, 'running...')
diff --git a/Lib/test/test_zipfile64.py b/Lib/test/test_zipfile64.py
@@ -18,8 +18,9 @@
 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
@@ -6,7 +6,7 @@
 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):

Original file line number	Diff line number	Diff line change
`@@ -170,4 +170,4 @@ class SystemTapOptimizedTests(TraceTests, unittest.TestCase):`
`170`	`170`
`171`	`171`
`172`	`172`	`if __name__ == '__main__':`
`173`		`- test_main()`
	`173`	`+ unittest.main()`