[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 14d6e19)
python · Sep 21, 2023 · ca8da71 · ca8da71
1 parent e59ee6c
commit ca8da71
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 6 deletions.
diff --git 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 → Lib/test/test_dataclasses/__init__.py b/Lib/test/test_dataclasses.py → Lib/test/test_dataclasses/__init__.py
@@ -3568,10 +3568,10 @@ class C:
                 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 @@ def test_classvar_module_level_import(self):
                     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 → ...st/test_dataclasses/dataclass_module_1.py b/Lib/test/dataclass_module_1.py → ...st/test_dataclasses/dataclass_module_1.py
diff --git a/Lib/test/dataclass_module_1_str.py → ...est_dataclasses/dataclass_module_1_str.py b/Lib/test/dataclass_module_1_str.py → ...est_dataclasses/dataclass_module_1_str.py
diff --git a/Lib/test/dataclass_module_2.py → ...st/test_dataclasses/dataclass_module_2.py b/Lib/test/dataclass_module_2.py → ...st/test_dataclasses/dataclass_module_2.py
diff --git a/Lib/test/dataclass_module_2_str.py → ...est_dataclasses/dataclass_module_2_str.py b/Lib/test/dataclass_module_2_str.py → ...est_dataclasses/dataclass_module_2_str.py
diff --git a/Lib/test/dataclass_textanno.py → ...st/test_dataclasses/dataclass_textanno.py b/Lib/test/dataclass_textanno.py → ...st/test_dataclasses/dataclass_textanno.py
diff --git 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 \