summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Galindo <Pablogsal@gmail.com>2020-10-08 14:24:28 +0100
committerGitHub <noreply@github.com>2020-10-08 06:24:28 -0700
commit4a9f82f50d957b6cf3fd207de8b583d9137316b8 (patch)
treeacc610941025f7ce5026f863413c7e44832602a2
parent35f041dd0171f575fc3adce1709b31fdf45a5ff6 (diff)
downloadcpython-git-4a9f82f50d957b6cf3fd207de8b583d9137316b8.tar.gz
bpo-41970: Avoid test failure in test_lib2to3 if the module is already imported (GH-22595)
… Automerge-Triggered-By: @pablogsal
-rw-r--r--Lib/test/test_lib2to3.py3
-rw-r--r--Misc/NEWS.d/next/Tests/2020-10-08-14-00-17.bpo-41970.aZ8QFf.rst2
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_lib2to3.py b/Lib/test/test_lib2to3.py
index 159a8387e4..fd12a7e7ac 100644
--- a/Lib/test/test_lib2to3.py
+++ b/Lib/test/test_lib2to3.py
@@ -1,8 +1,9 @@
import unittest
+from test.support.import_helper import import_fresh_module
from test.support.warnings_helper import check_warnings
with check_warnings(("", PendingDeprecationWarning)):
- from lib2to3.tests import load_tests
+ load_tests = import_fresh_module('lib2to3.tests', fresh=['lib2to3']).load_tests
if __name__ == '__main__':
unittest.main()
diff --git a/Misc/NEWS.d/next/Tests/2020-10-08-14-00-17.bpo-41970.aZ8QFf.rst b/Misc/NEWS.d/next/Tests/2020-10-08-14-00-17.bpo-41970.aZ8QFf.rst
new file mode 100644
index 0000000000..4cdca197fb
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2020-10-08-14-00-17.bpo-41970.aZ8QFf.rst
@@ -0,0 +1,2 @@
+Avoid a test failure in ``test_lib2to3`` if the module has already imported
+at the time the test executes. Patch by Pablo Galindo.