Move up a few tests

Author: neonene

Lib/test/datetimetester.py

@@ -7233,6 +7233,9 @@ def setUp(self):
         if self.__class__.__name__.endswith('Pure'):
             self.skipTest('Not relevant in pure Python')
 
+    def assert_python_in_subinterp(self, *args, **kwargs):
+        return CapiTest.assert_python_in_subinterp(self, *args, **kwargs)
+
     @support.cpython_only
     def test_gh_120161(self):
         with self.subTest('simple'):
@@ -7301,8 +7304,31 @@ def test_update_type_cache(self):
         res = script_helper.assert_python_ok('-c', script)
         self.assertFalse(res.err)
 
-    def assert_python_in_subinterp(self, *args, **kwargs):
-        return CapiTest.assert_python_in_subinterp(self, *args, **kwargs)
+    def test_module_free(self):
+        script = textwrap.dedent("""
+            import sys
+            import gc
+            import weakref
+            ws = weakref.WeakSet()
+            for _ in range(3):
+                import _datetime
+                timedelta = _datetime.timedelta  # static type
+                ws.add(_datetime)
+                del sys.modules['_datetime']
+                del _datetime
+                gc.collect()
+                assert len(ws) == 0
+            """)
+        script_helper.assert_python_ok('-c', script)
+
+    @unittest.skipIf(not support.Py_DEBUG, "Debug builds only")
+    def test_no_leak(self):
+        script = textwrap.dedent("""
+            import datetime
+            datetime.datetime.strptime('20000101', '%Y%m%d').strftime('%Y%m%d')
+            """)
+        res = script_helper.assert_python_ok('-X', 'showrefcount', '-c', script)
+        self.assertIn(b'[0 refs, 0 blocks]', res.err)
 
     def test_static_type_on_subinterp(self):
         script = textwrap.dedent(f"""
@@ -7432,32 +7458,6 @@ def gen():
             res = self.assert_python_in_subinterp(True, script2)
             self.assertFalse(res.err)
 
-    def test_module_free(self):
-        script = textwrap.dedent("""
-            import sys
-            import gc
-            import weakref
-            ws = weakref.WeakSet()
-            for _ in range(3):
-                import _datetime
-                timedelta = _datetime.timedelta
-                ws.add(_datetime)
-                del sys.modules['_datetime']
-                del _datetime
-                gc.collect()
-                assert len(ws) == 0
-            """)
-        script_helper.assert_python_ok('-c', script)
-
-    @unittest.skipIf(not support.Py_DEBUG, "Debug builds only")
-    def test_no_leak(self):
-        script = textwrap.dedent("""
-            import datetime
-            datetime.datetime.strptime('20000101', '%Y%m%d').strftime('%Y%m%d')
-            """)
-        res = script_helper.assert_python_ok('-X', 'showrefcount', '-c', script)
-        self.assertIn(b'[0 refs, 0 blocks]', res.err)
-
 
 def load_tests(loader, standard_tests, pattern):
     standard_tests.addTest(ZoneInfoCompleteTest())