From: Christian Heimes <christian@python.org>
Date: Tue, 21 Jun 2022 12:51:39 +0000 (+0200)
Subject: gh-93839: Use load_package_tests() for testmock (GH-94055)
X-Git-Tag: v3.12.0a1~1183
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50ebd72fb0e69c78f95cea3d4a47589beb91ac37;p=thirdparty%2FPython%2Fcpython.git

gh-93839: Use load_package_tests() for testmock (GH-94055)



Fixes failing tests on WebAssembly platforms.

Automerge-Triggered-By: GH:tiran
---

diff --git a/Lib/test/test_unittest/testmock/__init__.py b/Lib/test/test_unittest/testmock/__init__.py
index 6ee60b23765e..bc502ef32d29 100644
--- a/Lib/test/test_unittest/testmock/__init__.py
+++ b/Lib/test/test_unittest/testmock/__init__.py
@@ -1,17 +1,6 @@
-import os
-import sys
-import unittest
+import os.path
+from test.support import load_package_tests
 
 
-here = os.path.dirname(__file__)
-loader = unittest.defaultTestLoader
-
 def load_tests(*args):
-    suite = unittest.TestSuite()
-    for fn in os.listdir(here):
-        if fn.startswith("test") and fn.endswith(".py"):
-            modname = "test.test_unittest.testmock." + fn[:-3]
-            __import__(modname)
-            module = sys.modules[modname]
-            suite.addTest(loader.loadTestsFromModule(module))
-    return suite
+    return load_package_tests(os.path.dirname(__file__), *args)