Fix some _testsinglephase issues

erlend-aasland · erlend-aasland · commit fde9548ad093 · 2024-03-05T12:46:48.000+01:00
diff --git a/Lib/test/test_importlib/extension/test_loader.py b/Lib/test/test_importlib/extension/test_loader.py
@@ -108,7 +108,7 @@ def setUp(self):
             )
         finder = self.machinery.FileFinder(None)
         self.spec = importlib.util.find_spec(self.name)
-        assert self.spec
+        self.assertIsNotNone(self.spec)
         self.loader = self.machinery.ExtensionFileLoader(
             self.name, self.spec.origin)
 
@@ -189,7 +189,7 @@ def setUp(self):
             )
         finder = self.machinery.FileFinder(None)
         self.spec = importlib.util.find_spec(self.name)
-        assert self.spec
+        self.assertIsNotNone(self.spec)
         self.loader = self.machinery.ExtensionFileLoader(
             self.name, self.spec.origin)
 
diff --git a/Lib/test/test_importlib/util.py b/Lib/test/test_importlib/util.py
@@ -13,6 +13,11 @@
 import tempfile
 import types
 
+try:
+    import _testsinglephase
+except ImportError:
+    raise unittest.SkipTest("requires _testsinglephase")
+
 
 BUILTINS = types.SimpleNamespace()
 BUILTINS.good_name = None
diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
@@ -170,7 +170,7 @@
 *shared*
 @MODULE__TESTIMPORTMULTIPLE_TRUE@_testimportmultiple _testimportmultiple.c
 @MODULE__TESTMULTIPHASE_TRUE@_testmultiphase _testmultiphase.c
-@MODULE__TESTMULTIPHASE_TRUE@_testsinglephase _testsinglephase.c
+@MODULE__TESTSINGLEPHASE_TRUE@_testsinglephase _testsinglephase.c
 @MODULE__TESTEXTERNALINSPECTION_TRUE@_testexternalinspection _testexternalinspection.c
 @MODULE__CTYPES_TEST_TRUE@_ctypes_test _ctypes/_ctypes_test.c
 
diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -7580,6 +7580,7 @@ PY_STDLIB_MOD([_testinternalcapi], [test "$TEST_MODULES" = yes])
 PY_STDLIB_MOD([_testbuffer], [test "$TEST_MODULES" = yes])
 PY_STDLIB_MOD([_testimportmultiple], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
 PY_STDLIB_MOD([_testmultiphase], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
+PY_STDLIB_MOD([_testsinglephase], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
 PY_STDLIB_MOD([_testexternalinspection], [test "$TEST_MODULES" = yes])
 PY_STDLIB_MOD([xxsubtype], [test "$TEST_MODULES" = yes])
 PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes])
