[3.11] pythongh-106016: Add Lib/test/test_module/ directory (pythonGH…

…-108293) (python#108304) pythongh-106016: Add Lib/test/test_module/ directory (pythonGH-108293) * Move Python scripts related to test_module to this new directory: good_getattr.py and bad_getattrX.py scripts. * Move Lib/test/test_module.py to Lib/test/test_module/__init__.py. (cherry picked from commit adfc118) Co-authored-by: Victor Stinner <[email protected]>
ambv · Aug 22, 2023 · 5be32d8 · 5be32d8
1 parent 8927cf0
commit 5be32d8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/Lib/test/test_module.py → Lib/test/test_module/__init__.py b/Lib/test/test_module.py → Lib/test/test_module/__init__.py
@@ -126,55 +126,55 @@ def test_weakref(self):
         self.assertIs(wr(), None)
 
     def test_module_getattr(self):
-        import test.good_getattr as gga
-        from test.good_getattr import test
+        import test.test_module.good_getattr as gga
+        from test.test_module.good_getattr import test
         self.assertEqual(test, "There is test")
         self.assertEqual(gga.x, 1)
         self.assertEqual(gga.y, 2)
         with self.assertRaisesRegex(AttributeError,
                                     "Deprecated, use whatever instead"):
             gga.yolo
         self.assertEqual(gga.whatever, "There is whatever")
-        del sys.modules['test.good_getattr']
+        del sys.modules['test.test_module.good_getattr']
 
     def test_module_getattr_errors(self):
-        import test.bad_getattr as bga
-        from test import bad_getattr2
+        import test.test_module.bad_getattr as bga
+        from test.test_module import bad_getattr2
         self.assertEqual(bga.x, 1)
         self.assertEqual(bad_getattr2.x, 1)
         with self.assertRaises(TypeError):
             bga.nope
         with self.assertRaises(TypeError):
             bad_getattr2.nope
-        del sys.modules['test.bad_getattr']
-        if 'test.bad_getattr2' in sys.modules:
-            del sys.modules['test.bad_getattr2']
+        del sys.modules['test.test_module.bad_getattr']
+        if 'test.test_module.bad_getattr2' in sys.modules:
+            del sys.modules['test.test_module.bad_getattr2']
 
     def test_module_dir(self):
-        import test.good_getattr as gga
+        import test.test_module.good_getattr as gga
         self.assertEqual(dir(gga), ['a', 'b', 'c'])
-        del sys.modules['test.good_getattr']
+        del sys.modules['test.test_module.good_getattr']
 
     def test_module_dir_errors(self):
-        import test.bad_getattr as bga
-        from test import bad_getattr2
+        import test.test_module.bad_getattr as bga
+        from test.test_module import bad_getattr2
         with self.assertRaises(TypeError):
             dir(bga)
         with self.assertRaises(TypeError):
             dir(bad_getattr2)
-        del sys.modules['test.bad_getattr']
-        if 'test.bad_getattr2' in sys.modules:
-            del sys.modules['test.bad_getattr2']
+        del sys.modules['test.test_module.bad_getattr']
+        if 'test.test_module.bad_getattr2' in sys.modules:
+            del sys.modules['test.test_module.bad_getattr2']
 
     def test_module_getattr_tricky(self):
-        from test import bad_getattr3
+        from test.test_module import bad_getattr3
         # these lookups should not crash
         with self.assertRaises(AttributeError):
             bad_getattr3.one
         with self.assertRaises(AttributeError):
             bad_getattr3.delgetattr
-        if 'test.bad_getattr3' in sys.modules:
-            del sys.modules['test.bad_getattr3']
+        if 'test.test_module.bad_getattr3' in sys.modules:
+            del sys.modules['test.test_module.bad_getattr3']
 
     def test_module_repr_minimal(self):
         # reprs when modules have no __file__, __name__, or __loader__

diff --git a/Lib/test/bad_getattr.py → Lib/test/test_module/bad_getattr.py b/Lib/test/bad_getattr.py → Lib/test/test_module/bad_getattr.py
diff --git a/Lib/test/bad_getattr2.py → Lib/test/test_module/bad_getattr2.py b/Lib/test/bad_getattr2.py → Lib/test/test_module/bad_getattr2.py
diff --git a/Lib/test/bad_getattr3.py → Lib/test/test_module/bad_getattr3.py b/Lib/test/bad_getattr3.py → Lib/test/test_module/bad_getattr3.py
diff --git a/Lib/test/good_getattr.py → Lib/test/test_module/good_getattr.py b/Lib/test/good_getattr.py → Lib/test/test_module/good_getattr.py
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -2012,6 +2012,7 @@ TESTSUBDIRS=	ctypes/test \
 		test/test_importlib/zipdata01 \
 		test/test_importlib/zipdata02 \
 		test/test_json \
+		test/test_module \
 		test/test_peg_generator \
 		test/test_sqlite3 \
 		test/test_tomllib \