From c6f41e62f55933f9735e9b9c103c6860685b028a Mon Sep 17 00:00:00 2001
From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
Date: Fri, 9 Oct 2020 15:38:42 +0530
Subject: [PATCH] [3.9] bpo-41970: Avoid test failure in test_lib2to3 if the
 module is already imported (GH-22595) (GH-22609)

(cherry picked from commit 4a9f82f50d957b6cf3fd207de8b583d9137316b8)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
---
 Lib/test/test_lib2to3.py                                      | 4 ++--
 .../next/Tests/2020-10-08-14-00-17.bpo-41970.aZ8QFf.rst       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Tests/2020-10-08-14-00-17.bpo-41970.aZ8QFf.rst

diff --git a/Lib/test/test_lib2to3.py b/Lib/test/test_lib2to3.py
index 15c317e957b..e939d47336e 100644
--- a/Lib/test/test_lib2to3.py
+++ b/Lib/test/test_lib2to3.py
@@ -1,8 +1,8 @@
 import unittest
-from test.support import check_warnings
+from test.support import check_warnings, import_fresh_module
 
 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 00000000000..4cdca197fbf
--- /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.