From: Pablo Galindo <Pablogsal@gmail.com>
Date: Thu, 8 Oct 2020 13:24:28 +0000 (+0100)
Subject: bpo-41970: Avoid test failure in test_lib2to3 if the module is already imported ... 
X-Git-Tag: v3.10.0a2~230
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a9f82f50d957b6cf3fd207de8b583d9137316b8;p=thirdparty%2FPython%2Fcpython.git

bpo-41970: Avoid test failure in test_lib2to3 if the module is already imported (GH-22595)



…

Automerge-Triggered-By: @pablogsal
---

diff --git a/Lib/test/test_lib2to3.py b/Lib/test/test_lib2to3.py
index 159a8387e4e9..fd12a7e7acbb 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 000000000000..4cdca197fbfc
--- /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.