Skip to content

[3.10] bpo-46425: Fix direct invocation of multiple test modules (GH-30666) #30699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 20, 2022
Merged

[3.10] bpo-46425: Fix direct invocation of multiple test modules (GH-30666) #30699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7a6daa
[3.10] bpo-46425: Fix direct invocation of multiple test modules (GH-…
sobolevn Jan 18, 2022
b9f8bd0
Delete test_freeze.py
sobolevn Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Lib/test/test_compileall.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import filecmp
import importlib.util
import io
import itertools
import os
import pathlib
import py_compile
Expand All @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_distutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
be run.
"""

import warnings
import unittest
from test import support
from test.support import warnings_helper

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_dtrace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,4 @@ class SystemTapOptimizedTests(TraceTests, unittest.TestCase):


if __name__ == '__main__':
test_main()
unittest.main()
3 changes: 2 additions & 1 deletion Lib/test/test_zipfile64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Lib/unittest/test/test_program.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down