[3.11] gh-108303: Create Lib/test/test_dataclasses/ directory (#108978) (#109675)

gh-108303: Create Lib/test/test_dataclasses/ directory (#108978)

Move test_dataclasses.py and its "dataclass_*.py" modules into the
new Lib/test/test_dataclasses/ subdirectory.

Backport to 3.11: update Lib/test/.ruff.toml.

(cherry picked from commit 14d6e197cc56e5256d501839a4e66e3864ab15f0)

diff --git a/Lib/test/.ruff.toml b/Lib/test/.ruff.toml
index 24f3f8c65dcf5fc3b9acf6544f91d961bd76df05..08bd5c8a87ee217e12a68eaf156d6d983a7c44c4 100644 (file)
--- a/Lib/test/.ruff.toml
+++ b/Lib/test/.ruff.toml
@@ -13,7 +13,7 @@ extend-exclude = [
     "test_fstring.py",
     # TODO Fix: F811 Redefinition of unused name
     "test_buffer.py",
-    "test_dataclasses.py",
+    "test_dataclasses/__init__.py",
     "test_descr.py",
     "test_enum.py",
     "test_functools.py",

diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses/__init__.py
similarity index 99%
rename from Lib/test/test_dataclasses.py
rename to Lib/test/test_dataclasses/__init__.py
index 4714d0bca8611431b92a57aefcca452e4e77ce68..682f351c6bdf5bc0c8a746b4b2ead9017932e25e 100644 (file)
--- a/Lib/test/test_dataclasses.py
+++ b/Lib/test/test_dataclasses/__init__.py
@@ -3568,10 +3568,10 @@ class TestStringAnnotations(unittest.TestCase):
                 self.assertEqual(C(10).x, 10)
 
     def test_classvar_module_level_import(self):
-        from test import dataclass_module_1
-        from test import dataclass_module_1_str
-        from test import dataclass_module_2
-        from test import dataclass_module_2_str
+        from test.test_dataclasses import dataclass_module_1
+        from test.test_dataclasses import dataclass_module_1_str
+        from test.test_dataclasses import dataclass_module_2
+        from test.test_dataclasses import dataclass_module_2_str
 
         for m in (dataclass_module_1, dataclass_module_1_str,
                   dataclass_module_2, dataclass_module_2_str,
@@ -3609,7 +3609,7 @@ class TestStringAnnotations(unittest.TestCase):
                     self.assertNotIn('not_iv4', c.__dict__)
 
     def test_text_annotations(self):
-        from test import dataclass_textanno
+        from test.test_dataclasses import dataclass_textanno
 
         self.assertEqual(
             get_type_hints(dataclass_textanno.Bar),

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

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

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

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

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

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 99b1be2206c7234966d0f13ce9febced512ecece..885089b994f7fae17add88f52408a8ddeb7fbfda 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1962,6 +1962,7 @@ TESTSUBDIRS=      ctypes/test \
                test/test_asyncio \
                test/test_capi \
                test/test_cppext \
+               test/test_dataclasses \
                test/test_email \
                test/test_email/data \
                test/test_import \