Integrated the custom RustPython function into test_multiprocessing + added handling for regrtest windows failure

terryluan12 · terryluan12 · commit 3615b3f5d742 · 2026-01-14T19:02:12.000-05:00
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
@@ -6717,18 +6717,18 @@ class ThreadsMixin(BaseMixin):
 #
 
 
-def get_temp_class(test_name, module, base, Mixin, type_):
+def get_temp_class(newname, __module__, base, Mixin, type_):
     # RUSTPYTHON specific function to define the Temp class
 
     # test_rapid_restart fails on:
     #     - 'test_multiprocessing_fork' in 'WithManagerTestManagerRestart' test, on windows and mac
     #     - 'test_multiprocessing_forkserver' in 'WithManagerTestManagerRestart' test on windows
     #     - `test_multiprocessing_spawn` in 'WithManagerTestManagerRestart' test on windows
     if (
-        test_name == 'WithManagerTestManagerRestart' and
+        newname == 'WithManagerTestManagerRestart' and
         (
             sys.platform == "win32" or
-            (sys.platform == "darwin" and 'test_multiprocessing_fork' in module)
+            (sys.platform == "darwin" and 'test_multiprocessing_fork' in __module__)
         )
     ):
         class Temp(base, Mixin, unittest.TestCase):
@@ -6765,21 +6765,7 @@ def install_tests_in_module_dict(remote_globs, start_method,
                     continue
                 newname = 'With' + type_.capitalize() + name[1:]
                 Mixin = local_globs[type_.capitalize() + 'Mixin']
-                if (newname == 'WithManagerTestManagerRestart' and
-                    (
-                        sys.platform == "win32" or
-                        (sys.platform == "darwin" and '.test_multiprocessing_fork.' in __module__)
-                    )):
-                    class Temp(base, Mixin, unittest.TestCase):
-                        @unittest.expectedFailure #TODO: RUSTPYTHON
-                        def test_rapid_restart(self):
-                            super().test_rapid_restart()
-                        
-                else:
-                    class Temp(base, Mixin, unittest.TestCase):
-                        pass
-                if type_ == 'manager':
-                    Temp = hashlib_helper.requires_hashdigest('sha256')(Temp)
+                Temp = get_temp_class(newname, __module__, base, Mixin, type_)
                 Temp.__name__ = Temp.__qualname__ = newname
                 Temp.__module__ = __module__
                 Temp.start_method = start_method
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
@@ -890,7 +890,7 @@ def test_module_test(self):
                 *self.regrtest_args, *self.tests]
         self.run_tests(args)
 
-    @unittest.expectedFailure  # TODO: RUSTPYTHON
+    @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON')
     def test_module_regrtest(self):
         # -m test.regrtest
         args = [*self.python_args, '-m', 'test.regrtest',
