[Python-checkins] bpo-46425: Fix direct invocation of multiple test modules (GH-30666)
serhiy-storchaka
webhook-mailer at python.org
Tue Jan 18 14:28:36 EST 2022
https://github.com/python/cpython/commit/1292aa6db5bed889a3c87df443754fcae0177801
commit: 1292aa6db5bed889a3c87df443754fcae0177801
branch: main
author: Nikita Sobolev <mail at sobolevn.me>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-01-18T21:28:18+02:00
summary:
bpo-46425: Fix direct invocation of multiple test modules (GH-30666)
files:
M Lib/test/test_compileall.py
M Lib/test/test_distutils.py
M Lib/test/test_dtrace.py
M Lib/test/test_tools/test_freeze.py
M Lib/test/test_zipfile64.py
M Lib/unittest/test/test_program.py
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index 9e15ecf3aae29..33f0c939325f5 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
@@ -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
index 4b40af0213234..d82d2b6423433 100644
--- 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
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/test/test_tools/test_freeze.py b/Lib/test/test_tools/test_freeze.py
index 386c35a973bc2..cca3c47f5ac05 100644
--- a/Lib/test/test_tools/test_freeze.py
+++ b/Lib/test/test_tools/test_freeze.py
@@ -6,8 +6,8 @@
from test import support
from test.support import os_helper
+from test.test_tools import imports_under_tool, skip_if_missing
-from . import imports_under_tool, skip_if_missing
skip_if_missing('freeze')
with imports_under_tool('freeze', 'test'):
import freeze as helper
diff --git a/Lib/test/test_zipfile64.py b/Lib/test/test_zipfile64.py
index 810fdedef39dd..0947013afbc6e 100644
--- 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
index f7049fbb24e7b..687f62996740e 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