diff options
author | Sam Gross <colesbury@gmail.com> | 2023-10-05 19:51:17 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-05 19:51:17 (GMT) |
commit | 3c2f3215cc81ec8470208176dd32d2aef84faa13 (patch) | |
tree | dd7fca14092f384d41b85be52ee8812acdec0e45 | |
parent | 5eae8dc2cb832af6ae1ee340fb0194107fe3bd6e (diff) | |
download | cpython-3c2f3215cc81ec8470208176dd32d2aef84faa13.zip cpython-3c2f3215cc81ec8470208176dd32d2aef84faa13.tar.gz cpython-3c2f3215cc81ec8470208176dd32d2aef84faa13.tar.bz2 |
gh-110119: Fix test_importlib `--disable-gil` Windows test failures (#110422)
Use "t" in the expected tag for `--disable-gil` builds in test_tagged_suffix.
-rw-r--r-- | Lib/test/test_importlib/test_windows.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_importlib/test_windows.py b/Lib/test/test_importlib/test_windows.py index a7586b3..a60a4c4 100644 --- a/Lib/test/test_importlib/test_windows.py +++ b/Lib/test/test_importlib/test_windows.py @@ -4,6 +4,7 @@ machinery = test_util.import_importlib('importlib.machinery') import os import re import sys +import sysconfig import unittest from test.support import import_helper from contextlib import contextmanager @@ -111,8 +112,10 @@ class WindowsRegistryFinderTests: class WindowsExtensionSuffixTests: def test_tagged_suffix(self): suffixes = self.machinery.EXTENSION_SUFFIXES - expected_tag = ".cp{0.major}{0.minor}-{1}.pyd".format(sys.version_info, - re.sub('[^a-zA-Z0-9]', '_', get_platform())) + abi_flags = "t" if sysconfig.get_config_var("Py_NOGIL") else "" + ver = sys.version_info + platform = re.sub('[^a-zA-Z0-9]', '_', get_platform()) + expected_tag = f".cp{ver.major}{ver.minor}{abi_flags}-{platform}.pyd" try: untagged_i = suffixes.index(".pyd") except ValueError: |