Move test location

python · zooba · Apr 11, 2025 · Mar 27, 2025 · Mar 27, 2025 · Mar 27, 2025
commit 3bccf1db8566a7960ca10bac0ebc7e52c80de7e8
@@ -456,20 +456,19 @@ def test_library(self):
         library = sysconfig.get_config_var('LIBRARY')
         ldlibrary = sysconfig.get_config_var('LDLIBRARY')
         major, minor = sys.version_info[:2]
-        if sys.platform == 'win32':
-            self.assertTrue(library.startswith(f'python{major}{minor}'))
-            self.assertTrue(library.endswith('.dll'))
+        abiflags = sysconfig.get_config_var('ABIFLAGS')
+        if sys.platform.startswith('win'):
+            self.assertEqual(library, f'python{major}{minor}{abiflags}.dll')
             self.assertEqual(library, ldlibrary)
         elif is_apple_mobile:
             framework = sysconfig.get_config_var('PYTHONFRAMEWORK')
             self.assertEqual(ldlibrary, f"{framework}.framework/{framework}")
         else:
-            self.assertTrue(library.startswith(f'libpython{major}.{minor}'))
-            self.assertTrue(library.endswith('.a'))
+            self.assertEqual(library, f'libpython{major}.{minor}{abiflags}.a')
             if sys.platform == 'darwin' and sys._framework:
                 self.skipTest('gh-110824: skip LDLIBRARY test for framework build')
             else:
-                self.assertTrue(ldlibrary.startswith(f'libpython{major}.{minor}'))
+                self.assertStartsWith(ldlibrary, f'libpython{major}.{minor}{abiflags}')
 
     @unittest.skipUnless(sys.platform == "darwin", "test only relevant on MacOSX")
     @requires_subprocess()

diff --git a/Lib/test/test_winapi.py b/Lib/test/test_winapi.py
@@ -127,17 +127,6 @@ def test_getshortpathname(self):
         # Should contain "PROGRA~" but we can't predict the number
         self.assertIsNotNone(re.match(r".\:\\PROGRA~\d", actual.upper()), actual)
 
-    def test_getmodulefilename(self):
-        dll_file_path = _winapi.GetModuleFileName(sys.dllhandle)
-        dll_file_name = os.path.basename(dll_file_path)
-        self.assertEqual(
-            dll_file_name,
-            "python{vi.major}{vi.minor}{abiflags}.dll".format(
-                vi=sys.version_info,
-                abiflags=sysconfig.get_config_var('ABIFLAGS'),
-            ),
-        )
-
     def test_namedpipe(self):
         pipe_name = rf"\\.\pipe\LOCAL\{os_helper.TESTFN}"