Skip to content

Commit 1292aa6

Browse files
authored
bpo-46425: Fix direct invocation of multiple test modules (GH-30666)
1 parent ff7703c commit 1292aa6

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

Lib/test/test_compileall.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import filecmp
44
import importlib.util
55
import io
6-
import itertools
76
import os
87
import pathlib
98
import py_compile
@@ -29,9 +28,8 @@
2928
from test import support
3029
from test.support import os_helper
3130
from test.support import script_helper
32-
33-
from .test_py_compile import without_source_date_epoch
34-
from .test_py_compile import SourceDateEpochTestMeta
31+
from test.test_py_compile import without_source_date_epoch
32+
from test.test_py_compile import SourceDateEpochTestMeta
3533

3634

3735
def get_pyc(script, opt):

Lib/test/test_distutils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
be run.
66
"""
77

8-
import warnings
8+
import unittest
99
from test import support
1010
from test.support import warnings_helper
1111

Lib/test/test_dtrace.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,4 @@ class SystemTapOptimizedTests(TraceTests, unittest.TestCase):
170170

171171

172172
if __name__ == '__main__':
173-
test_main()
173+
unittest.main()

Lib/test/test_tools/test_freeze.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
from test import support
88
from test.support import os_helper
9+
from test.test_tools import imports_under_tool, skip_if_missing
910

10-
from . import imports_under_tool, skip_if_missing
1111
skip_if_missing('freeze')
1212
with imports_under_tool('freeze', 'test'):
1313
import freeze as helper

Lib/test/test_zipfile64.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
from tempfile import TemporaryFile
1919

2020
from test.support import os_helper
21-
from test.support import TESTFN, requires_zlib
21+
from test.support import requires_zlib
2222

23+
TESTFN = os_helper.TESTFN
2324
TESTFN2 = TESTFN + "2"
2425

2526
# How much time in seconds can pass before we print a 'Still working' message.

Lib/unittest/test/test_program.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from test import support
77
import unittest
88
import unittest.test
9-
from .test_result import BufferedWriter
9+
from unittest.test.test_result import BufferedWriter
1010

1111

1212
class Test_TestProgram(unittest.TestCase):

0 commit comments

Comments
 (0)