gh-106016: Add Lib/test/test_module/ directory (#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.

diff --git a/Lib/test/test_module.py b/Lib/test/test_module/__init__.py
similarity index 92%
rename from Lib/test/test_module.py
rename to Lib/test/test_module/__init__.py
index c7eb92290e1b6d1f9acbfeeb61e403ca617b0616..cfc4d9ccf1cc81a0b46b0d530972f983452acdc6 100644 (file)
--- a/Lib/test/test_module.py
+++ b/Lib/test/test_module/__init__.py
@@ -126,8 +126,8 @@ a = A(destroyed)"""
         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)
@@ -135,46 +135,46 @@ a = A(destroyed)"""
                                     "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 b/Lib/test/test_module/bad_getattr.py
similarity index 100%
rename from Lib/test/bad_getattr.py
rename to Lib/test/test_module/bad_getattr.py

diff --git a/Lib/test/bad_getattr2.py b/Lib/test/test_module/bad_getattr2.py
similarity index 100%
rename from Lib/test/bad_getattr2.py
rename to Lib/test/test_module/bad_getattr2.py

diff --git a/Lib/test/bad_getattr3.py b/Lib/test/test_module/bad_getattr3.py
similarity index 100%
rename from Lib/test/bad_getattr3.py
rename to Lib/test/test_module/bad_getattr3.py

diff --git a/Lib/test/good_getattr.py b/Lib/test/test_module/good_getattr.py
similarity index 100%
rename from Lib/test/good_getattr.py
rename to Lib/test/test_module/good_getattr.py

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 9be5c3b50eb9ee2105e42be49e714fe73368ce9e..beccab45a235a556701806c11cf457da436d7c69 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2212,6 +2212,7 @@ TESTSUBDIRS=      idlelib/idle_test \
                test/test_importlib/resources/zipdata02 \
                test/test_importlib/source \
                test/test_json \
+               test/test_module \
                test/test_peg_generator \
                test/test_sqlite3 \
                test/test_tkinter \