Make tests realistic by using subinterp

Author: neonene

Lib/test/datetimetester.py

@@ -7176,6 +7176,7 @@ def test_type_check_in_subinterp(self):
                 spec = importlib.util.spec_from_loader(fullname, loader)
                 module = importlib.util.module_from_spec(spec)
                 spec.loader.exec_module(module)
+                module.test_datetime_capi()
 
             def run(type_checker, obj):
                 if not type_checker(obj, True):
@@ -7314,38 +7315,77 @@ def gen():
         res = script_helper.assert_python_ok('-c', script)
         self.assertFalse(res.err)
 
+    def run_script_132413(self, script):
+        # iOS requires the use of the custom framework loader,
+        # not the ExtensionFileLoader.
+        if sys.platform == "ios":
+            extension_loader = "AppleFrameworkLoader"
+        else:
+            extension_loader = "ExtensionFileLoader"
+
+        main_interp_script = textwrap.dedent(f'''
+            import textwrap
+            from test import support
+
+            sub_script = textwrap.dedent("""
+                if {_interpreters is None}:
+                    import _testcapi as module
+                else:
+                    import importlib.machinery
+                    import importlib.util
+                    fullname = '_testcapi_datetime'
+                    origin = importlib.util.find_spec('_testcapi').origin
+                    loader = importlib.machinery.{extension_loader}(fullname, origin)
+                    spec = importlib.util.spec_from_loader(fullname, loader)
+                    module = importlib.util.module_from_spec(spec)
+                    spec.loader.exec_module(module)
+
+                # Skip calling test_datetime_capi()
+                $REPLACE_ME$
+            """)
+
+            import _testcapi
+            _testcapi.test_datetime_capi()
+
+            if {_interpreters is None}:
+                ret = support.run_in_subinterp(sub_script)
+            else:
+                import _interpreters
+                config = _interpreters.new_config('isolated').__dict__
+                ret = support.run_in_subinterp_with_config(sub_script, **config)
+
+            assert ret == 0
+
+        ''').replace('$REPLACE_ME$', textwrap.indent(script, '\x20'*4))
+
+        res = script_helper.assert_python_ok('-c', main_interp_script)
+        return res
+
     def test_static_type_at_shutdown3(self):
         script = textwrap.dedent("""
-            import gc
-            import sys
-            from _datetime import timedelta
-            del sys.modules['_datetime']
-            gc.collect()
+            timedelta = module.get_delta_type()
 
             def gen():
-                try:
-                    yield
-                finally:
-                    timedelta(days=1)
+                 try:
+                     yield
+                 finally:
+                     timedelta(days=1)
 
             it = gen()
             next(it)
-            """)
-        res = script_helper.assert_python_ok('-c', script)
+        """)
+        res = self.run_script_132413(script)
         self.assertIn(b'ImportError: sys.meta_path is None', res.err)
 
     def test_static_type_before_shutdown(self):
-        script = textwrap.dedent("""
-            import gc
+        script = textwrap.dedent(f"""
             import sys
-            from _datetime import timedelta
-            del sys.modules['_datetime']
-            gc.collect()
-
+            assert '_datetime' not in sys.modules
+            timedelta = module.get_delta_type()
             timedelta(days=1)
             assert '_datetime' in sys.modules
-            """)
-        res = script_helper.assert_python_ok('-c', script)
+        """)
+        res = self.run_script_132413(script)
         self.assertFalse(res.err)
 
     def test_module_free(self):
@@ -7356,7 +7396,7 @@ def test_module_free(self):
             ws = weakref.WeakSet()
             for _ in range(3):
                 import _datetime
-                td = _datetime.timedelta
+                timedelta = _datetime.timedelta
                 ws.add(_datetime)
                 del sys.modules['_datetime']
                 del _datetime

Modules/_datetimemodule.c

@@ -155,7 +155,7 @@ _get_current_state(PyObject **p_mod)
     PyObject *mod = PyImport_ImportModule("_datetime");
     if (mod == NULL) {
         assert(_Py_IsInterpreterFinalizing(interp));
-        /* It is not preferable to reload the module implicitly here. */
+        /* We do not take care of the unlikely case. */
         return NULL;
     }
     st = get_module_state(mod);

Modules/_testcapi/datetime.c

@@ -453,6 +453,12 @@ test_PyDateTime_DELTA_GET(PyObject *self, PyObject *obj)
     return Py_BuildValue("(iii)", days, seconds, microseconds);
 }
 
+static PyObject *
+get_delta_type(PyObject *self, PyObject *args)
+{
+    return PyDateTimeAPI ? Py_NewRef(PyDateTimeAPI->DeltaType) : Py_None;
+}
+
 static PyMethodDef test_methods[] = {
     {"PyDateTime_DATE_GET",         test_PyDateTime_DATE_GET,       METH_O},
     {"PyDateTime_DELTA_GET",        test_PyDateTime_DELTA_GET,      METH_O},
@@ -469,6 +475,7 @@ static PyMethodDef test_methods[] = {
     {"get_datetime_fromdateandtimeandfold", get_datetime_fromdateandtimeandfold, METH_VARARGS},
     {"get_datetime_fromtimestamp",  get_datetime_fromtimestamp,     METH_VARARGS},
     {"get_delta_fromdsu",           get_delta_fromdsu,              METH_VARARGS},
+    {"get_delta_type",               get_delta_type,                METH_NOARGS},
     {"get_time_fromtime",           get_time_fromtime,              METH_VARARGS},
     {"get_time_fromtimeandfold",    get_time_fromtimeandfold,       METH_VARARGS},
     {"get_timezone_utc_capi",       get_timezone_utc_capi,          METH_VARARGS},
@@ -495,9 +502,7 @@ _PyTestCapi_Init_DateTime(PyObject *mod)
 static int
 _testcapi_datetime_exec(PyObject *mod)
 {
-    if (test_datetime_capi(NULL, NULL) == NULL)  {
-        return -1;
-    }
+    // Call test_datetime_capi() in each test.
     return 0;
 }