Skip to content

gh-89745: Avoid exact match when comparing program_name in test_embed on Windows #93888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 5 commits into from
Jun 17, 2022
Merged

gh-89745: Avoid exact match when comparing program_name in test_embed on Windows #93888

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7aa9dc1
gh-89745: Avoid exact match when comparing program_name in test_embed…
neonene Jun 16, 2022
ce853e4
raw string
neonene Jun 16, 2022
4bd62a4
str check
neonene Jun 16, 2022
caaec54
fix missing ce853e4
neonene Jun 16, 2022
383a327
no regex
neonene Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
str check
  • Loading branch information
@neonene
neonene authored Jun 16, 2022
commit 4bd62a40fb66f57997a2f1f0b2fc0ef643e20244
8 changes: 5 additions & 3 deletions Lib/test/test_embed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,9 +701,11 @@ def check_pre_config(self, configs, expected):

def check_config(self, configs, expected):
config = dict(configs['config'])
if MS_WINDOWS and (value := config.get('program_name')):
ptn = r'_d\.exe$' if debug_build(sys.executable) else r'\.exe$'
config['program_name'] = re.sub(ptn, '', value, 1, re.I)
if MS_WINDOWS:
value = config.get('program_name')
if value and isinstance(value, str):
ptn = '_d.exe$' if debug_build(sys.executable) else '.exe$'
config['program_name'] = re.sub(ptn, '', value, 1, re.IGNORECASE)
for key, value in list(expected.items()):
if value is self.IGNORE_CONFIG:
config.pop(key, None)
Expand Down