Skip to content
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

Jump to bottom

gh-116622: Make test_unzip_zipfile recognize Android error message format #124462

Merged
merged 3 commits into from
Sep 25, 2024
Merged

gh-116622: Make test_unzip_zipfile recognize Android error message format #124462

merged 3 commits into from
Sep 25, 2024

Conversation

mhsmith
Copy link
Member

@mhsmith mhsmith commented Sep 24, 2024 •
edited by bedevere-app bot
Loading

The test expects the format unrecognized option: t, but the Android message is invalid option -- t.

This only failed in a fairly narrow range of Android versions including API level 30. Older versions didn't include an unzip command at all, and newer versions included a version that supports the -t option.

@mhsmith mhsmith added skip news needs backport to 3.13 bugs and security fixes labels Sep 24, 2024
@bedevere-app bedevere-app bot added awaiting review tests Tests in the Lib/test dir labels Sep 24, 2024
@bedevere-app bedevere-app bot mentioned this pull request Sep 24, 2024
Closed
freakboy3742
freakboy3742 requested changes Sep 24, 2024
View reviewed changes
Lib/test/test_shutil.py Outdated
@@ -1909,7 +1910,7 @@ def test_unzip_zipfile(self):
subprocess.check_output(zip_cmd, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as exc:
details = exc.output.decode(errors="replace")
if 'unrecognized option: t' in details:
if re.search(r'(unrecognized|invalid) option(:| --) t', details):
Copy link
Contributor

Choose a reason for hiding this comment

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

While this regex works, I think it would be better to be explicit about the 2 forms of the message that we know exist, rather than try to catch all possible variations and combinations. My experience has been that tests that try t be "smart" have a nasty habit of biting you when you least expect it.

@bedevere-app
Copy link

bedevere-app bot commented Sep 24, 2024

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@mhsmith
Copy link
Member Author

mhsmith commented Sep 25, 2024

I have made the requested changes; please review again.

@bedevere-app
Copy link

bedevere-app bot commented Sep 25, 2024

Thanks for making the requested changes!

@freakboy3742: please review the changes made to this pull request.

freakboy3742
freakboy3742 approved these changes Sep 25, 2024
View reviewed changes
Copy link
Contributor

@freakboy3742 freakboy3742 left a comment

Choose a reason for hiding this comment

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

👍

@freakboy3742 freakboy3742 merged commit 461c12b into python:main Sep 25, 2024
33 of 34 checks passed
@miss-islington-app
Copy link

Thanks @mhsmith for the PR, and @freakboy3742 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 25, 2024
@mhsmith @miss-islington
pythongh-116622: Make test_unzip_zipfile recognize Android error mess…
a553651 
…age format (pythonGH-124462)

Make test_unzip_zipfile recognize Android error message format
(cherry picked from commit 461c12b)

Co-authored-by: Malcolm Smith <[email protected]>
@bedevere-app
Copy link

bedevere-app bot commented Sep 25, 2024

GH-124516 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Sep 25, 2024
Yhg1s pushed a commit that referenced this pull request Sep 30, 2024
@miss-islington @mhsmith
[3.13] gh-116622: Make test_unzip_zipfile recognize Android error mes…
0a57fe3 
…sage format (GH-124462) (#124516)

gh-116622: Make test_unzip_zipfile recognize Android error message format (GH-124462)

Make test_unzip_zipfile recognize Android error message format
(cherry picked from commit 461c12b)

Co-authored-by: Malcolm Smith <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@freakboy3742 freakboy3742 freakboy3742 approved these changes

Assignees
No one assigned
Labels
skip news tests Tests in the Lib/test dir
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mhsmith @freakboy3742