[Python-checkins] [3.9] bpo-46425: Fix direct invocation of multiple test modules (GH-30666) (GH-30700)

corona10 webhook-mailer at python.org
Wed Jan 19 20:43:58 EST 2022


https://github.com/python/cpython/commit/8105dd24112509fab2eabfce5352afc41e3a34b6
commit: 8105dd24112509fab2eabfce5352afc41e3a34b6
branch: 3.9
author: Nikita Sobolev <mail at sobolevn.me>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-01-20T10:43:49+09:00
summary:

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

files:
M Lib/test/test_compileall.py
M Lib/test/test_distutils.py
M Lib/test/test_dtrace.py
M Lib/unittest/test/test_program.py

diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index 6e1f4b2f397e2..a904f426b172a 100644
--- 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
@@ -24,9 +23,8 @@
 
 from test import support
 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 790d39c6d35ae..849aa737e9bdc 100644
--- a/Lib/test/test_distutils.py
+++ b/Lib/test/test_distutils.py
@@ -7,7 +7,7 @@
 
 import distutils.tests
 import test.support
-
+import unittest
 
 def load_tests(*_):
     # used by unittest
diff --git a/Lib/test/test_dtrace.py b/Lib/test/test_dtrace.py
index 3957077f5d612..8a436ad123b80 100644
--- 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/unittest/test/test_program.py b/Lib/unittest/test/test_program.py
index 4746d71e0b603..b7fbbc1e7badd 100644
--- 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):



More information about the Python-checkins mailing list