[Python-checkins] [3.12] gh-106016: Add Lib/test/test_module/ directory (#108293) (#108306)

[Yhg1s]

https://github.com/python/cpython/commit/ca47a2183a35d4b71cc062c926b7f96112fdf5ce
commit: ca47a2183a35d4b71cc062c926b7f96112fdf5ce
branch: 3.12
author: Victor Stinner <vstinner at python.org>
committer: Yhg1s <thomas at python.org>
date: 2023-08-22T22:06:07+02:00
summary:

[3.12] gh-106016: Add Lib/test/test_module/ directory (#108293) (#108306)

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.

(cherry picked from commit adfc118fdab66882599e01a84c22bd897055f3f1)

files:
A Lib/test/test_module/__init__.py
A Lib/test/test_module/bad_getattr.py
A Lib/test/test_module/bad_getattr2.py
A Lib/test/test_module/bad_getattr3.py
A Lib/test/test_module/good_getattr.py
D Lib/test/bad_getattr.py
D Lib/test/bad_getattr2.py
D Lib/test/bad_getattr3.py
D Lib/test/good_getattr.py
D Lib/test/test_module.py
M Makefile.pre.in

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 c7eb92290e1b6..cfc4d9ccf1cc8 100644
--- a/Lib/test/test_module.py
+++ b/Lib/test/test_module/__init__.py
@@ -126,8 +126,8 @@ 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)
@@ -135,46 +135,46 @@ def test_module_getattr(self):
                                     "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 a74f4fd66d323..d9d56bb45ce71 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2192,6 +2192,7 @@ TESTSUBDIRS=	idlelib/idle_test \
 		test/test_lib2to3/data \
 		test/test_lib2to3/data/fixers \
 		test/test_lib2to3/data/fixers/myfixes \
+		test/test_module \
 		test/test_peg_generator \
 		test/test_sqlite3 \
 		test/test_tkinter \