From 8105dd24112509fab2eabfce5352afc41e3a34b6 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Thu, 20 Jan 2022 04:43:49 +0300 Subject: [PATCH] [3.9] bpo-46425: Fix direct invocation of multiple test modules (GH-30666) (GH-30700) --- Lib/test/test_compileall.py | 6 ++---- Lib/test/test_distutils.py | 2 +- Lib/test/test_dtrace.py | 2 +- Lib/unittest/test/test_program.py | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py index 6e1f4b2f397e..a904f426b172 100644 --- a/Lib/test/test_compileall.py +++ b/Lib/test/test_compileall.py @@ -3,7 +3,6 @@ import contextlib import filecmp import importlib.util import io -import itertools import os import pathlib import py_compile @@ -24,9 +23,8 @@ except ImportError: 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 790d39c6d35a..849aa737e9bd 100644 --- a/Lib/test/test_distutils.py +++ b/Lib/test/test_distutils.py @@ -7,7 +7,7 @@ be run. 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 3957077f5d61..8a436ad123b8 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 4746d71e0b60..b7fbbc1e7bad 100644 --- a/Lib/unittest/test/test_program.py +++ b/Lib/unittest/test/test_program.py @@ -6,7 +6,7 @@ import subprocess 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): -- 2.47.3