Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-90548: Make musl test skips smarter (fixes Alpine errors) #131313

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
bitdancer merged 9 commits into from
Mar 19, 2025
Merged

gh-90548: Make musl test skips smarter (fixes Alpine errors) #131313

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2348711
Make musl test skips smarter (fixes Alpine errors)
bitdancer Mar 15, 2025
35960c1
Platform tests and bug fixes.
bitdancer Mar 15, 2025
417143e
Add docs, including some existing is_xxx's.
bitdancer Mar 15, 2025
ef36eb2
Address vstinner review comments.
bitdancer Mar 17, 2025
909ea3b
Test some version number variants we accept.
bitdancer Mar 17, 2025
4e76d78
Add news item about libc_ver enhancement.
bitdancer Mar 17, 2025
83add5d
Fix 'in' phrase logic.
bitdancer Mar 18, 2025
4d6aa92
Prettify re expression using re.VERBOSE.
bitdancer Mar 18, 2025
111e2ec
Use more verbose style rather than :=
bitdancer Mar 18, 2025
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
Test some version number variants we accept.
  • Loading branch information
@bitdancer
bitdancer committed Mar 17, 2025
commit 909ea3b9d38ee29c682c1764626b9885ed25c184
3 changes: 3 additions & 0 deletions Lib/test/test_platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,9 @@ def test_libc_ver(self):
(b'libc.so.1.2.5', ('libc', '1.2.5')),
(b'libc_pthread.so.1.2.5', ('libc', '1.2.5_pthread')),
(b'/aports/main/musl/src/musl-1.2.5', ('musl', '1.2.5')),
Copy link
Member

@vstinner vstinner Mar 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests on version with 2 numbers and 4 numbers? Like /aports/main/musl/src/musl-1.2 and /aports/main/musl/src/musl-1.2.5.1.

Copy link
Member Author

@bitdancer bitdancer Mar 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could, but I don't believe musl will ever have such release numbers, so is it worth doing?

Copy link
Member

@vstinner vstinner Mar 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parsing a binary file using a regular expression is a strange thing for me. So I prefer to have tests to make sure that the implementation is reliable. The question is more if the regex will match versions with 2 members (x.y) or 4 members (x.y.z.a), or if it only matchs version with 3 members (x.y.z).

Copy link
Member Author

@bitdancer bitdancer Mar 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough, though the existing tests don't do that, nor do they test the no-match cases. I could add such tests, but at that point I'd want to rewrite this test method to split it up into multiple tests, and I don't think that's in scope for this PR :) I'll add the couple of extra checks, though.

# musl uses semver, but we accept some variations anyway:
(b'/aports/main/musl/src/musl-12.5', ('musl', '12.5')),
(b'/aports/main/musl/src/musl-1.2.5.7', ('musl', '1.2.5.7')),
(b'', ('', '')),
):
with open(filename, 'wb') as fp:
Expand Down
Loading