From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 4 Oct 2023 11:09:43 +0000 (-0700)
Subject: [3.11] gh-108927: Fix test_import + test_importlib + test_unittest problem (GH-108929... 
X-Git-Tag: v3.11.7~253
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=497c8c4520e563e6b21f6707adb617542798e125;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-108927: Fix test_import + test_importlib + test_unittest problem (GH-108929) (#110347)

gh-108927: Fix test_import + test_importlib + test_unittest problem (GH-108929)
(cherry picked from commit 3f89b257639dd817a32079da2ae2c4436b8e82eb)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
---

diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py
index 3b58786ec16a..c39ad2e3acfb 100644
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -6,7 +6,6 @@ import types
 import pickle
 from test import support
 from test.support import import_helper
-import test.test_importlib.util
 
 import unittest
 import unittest.mock
@@ -826,6 +825,8 @@ class TestDiscovery(unittest.TestCase):
                          'as dotted module names')
 
     def test_discovery_failed_discovery(self):
+        from test.test_importlib import util
+
         loader = unittest.TestLoader()
         package = types.ModuleType('package')
 
@@ -837,7 +838,7 @@ class TestDiscovery(unittest.TestCase):
             # Since loader.discover() can modify sys.path, restore it when done.
             with import_helper.DirsOnSysPath():
                 # Make sure to remove 'package' from sys.modules when done.
-                with test.test_importlib.util.uncache('package'):
+                with util.uncache('package'):
                     with self.assertRaises(TypeError) as cm:
                         loader.discover('package')
                     self.assertEqual(str(cm.exception),