From 50b81a2c2a88b94d5177d853307bec126c050869 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Tue, 18 Jan 2022 22:28:18 +0300 Subject: [PATCH 1/2] [3.9] bpo-46425: Fix direct invocation of multiple test modules (GH-30666). (cherry picked from commit 1292aa6db5bed889a3c87df443754fcae0177801) Co-authored-by: Nikita Sobolev --- Lib/test/test_compileall.py | 6 ++---- Lib/test/test_distutils.py | 2 +- Lib/test/test_dtrace.py | 2 +- Lib/test/test_zipfile64.py | 1 - Lib/unittest/test/test_program.py | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py index 6e1f4b2f397e28..a904f426b172ac 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 790d39c6d35aec..849aa737e9bdce 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 3957077f5d6123..8a436ad123b80f 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_zipfile64.py b/Lib/test/test_zipfile64.py index 3a788de221264d..fae5ac65686695 100644 --- a/Lib/test/test_zipfile64.py +++ b/Lib/test/test_zipfile64.py @@ -16,7 +16,6 @@ import sys from tempfile import TemporaryFile - from test.support import TESTFN, requires_zlib TESTFN2 = TESTFN + "2" diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_program.py index 4746d71e0b6039..b7fbbc1e7baddd 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): From 142efc94e44a4108af943e04bcde8176b508f6a7 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Wed, 19 Jan 2022 20:15:40 +0300 Subject: [PATCH 2/2] Update test_zipfile64.py --- Lib/test/test_zipfile64.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/test/test_zipfile64.py b/Lib/test/test_zipfile64.py index fae5ac65686695..3a788de221264d 100644 --- a/Lib/test/test_zipfile64.py +++ b/Lib/test/test_zipfile64.py @@ -16,6 +16,7 @@ import sys from tempfile import TemporaryFile + from test.support import TESTFN, requires_zlib TESTFN2 = TESTFN + "2"