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-125041: test_zlib: For s390x HW acceleration, only skip checking the compressed bytes #125042

Merged
merged 2 commits into from
Oct 15, 2024
Merged

gh-125041: test_zlib: For s390x HW acceleration, only skip checking the compressed bytes #125042

merged 2 commits into from
Oct 15, 2024

Conversation

encukou
Copy link
Member

@encukou encukou commented Oct 7, 2024 •
edited by bedevere-app bot
Loading

@bedevere-app bedevere-app bot mentioned this pull request Oct 7, 2024
Open
rruuaanng
rruuaanng reviewed Oct 8, 2024
View reviewed changes
Misc/NEWS.d/next/Tests/2024-10-07-14-13-38.gh-issue-125041.PKLWDf.rst
@@ -0,0 +1,3 @@
Re-enable skipped tests for :mod:`zlib` on the s390x architecture: only skip
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems that NEWS isn't required for unittest.

Copy link
Member Author

Choose a reason for hiding this comment

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

Right, it's not required.

@encukou
Copy link
Member Author

encukou commented Oct 8, 2024

s390x buildbots were removed, so there's no way for me to test this right now :(
@vstinner, do you want to review this?

@encukou
Copy link
Member Author

encukou commented Oct 14, 2024

!buildbot s390x

@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @encukou for commit 126109b 🤖

The command will test the builders whose names match following regular expression: s390x

The builders matched are:

  • s390x RHEL8 PR
  • s390x RHEL8 Refleaks PR
  • s390x RHEL8 LTO PR
  • s390x RHEL9 LTO + PGO PR
  • s390x RHEL8 LTO + PGO PR
  • s390x RHEL9 Refleaks PR
  • s390x RHEL9 LTO PR
  • s390x RHEL9 PR

vstinner
vstinner approved these changes Oct 14, 2024
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM. I just left minor coding style remarks.

I don't recall exactly the details, I skipped these tests 2 years ago. But from what I read, the change looks correct.

Sadly, I don't recall how to reproduce the issue: how to get access to a s390x machine where the hardware acceleration is enabled.

Lib/test/test_zlib.py Outdated
self.assertEqual(zlib.compress(bytearray(data)), x)
if not HW_ACCELERATED:
# With hardware acceleration, the compressed bytes
# might not be identical.
Copy link
Member

Choose a reason for hiding this comment

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

nitpick: can you put the comment on the if instead? same comment below.

Lib/test/test_zlib.py Outdated Show resolved Hide resolved
@encukou
Copy link
Member Author

encukou commented Oct 15, 2024

The new builders have HW acceleration -- the tests fail on main :)

encukou
encukou commented Oct 15, 2024
View reviewed changes
Lib/test/test_zlib.py Outdated Show resolved Hide resolved
encukou
encukou commented Oct 15, 2024
View reviewed changes
Lib/test/test_zlib.py Outdated Show resolved Hide resolved
@encukou
Copy link
Member Author

encukou commented Oct 15, 2024

Sorry, not main -- I meant “the existing branch”: 3.10 in particular.

@encukou encukou enabled auto-merge (squash) October 15, 2024 11:06
@encukou encukou merged commit cc5a225 into python:main Oct 15, 2024
34 checks passed
@encukou encukou deleted the zlib-hw-skip branch October 15, 2024 14:25
@encukou encukou added needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes labels Oct 15, 2024
@miss-islington-app
Copy link

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington-app
Copy link

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry, @encukou, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker cc5a225cdc2a5d4e035dd08d59cef39182c10a6c 3.11

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 15, 2024
@encukou @miss-islington
pythongh-125041: test_zlib: For s390x HW acceleration, only skip chec…
2025325 
…king the compressed bytes (pythonGH-125042)

(cherry picked from commit cc5a225)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 15, 2024
@encukou @miss-islington
pythongh-125041: test_zlib: For s390x HW acceleration, only skip chec…
4940091 
…king the compressed bytes (pythonGH-125042)

(cherry picked from commit cc5a225)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Oct 15, 2024

GH-125526 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Oct 15, 2024
@bedevere-app
Copy link

bedevere-app bot commented Oct 15, 2024

GH-125527 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 Oct 15, 2024
encukou added a commit that referenced this pull request Oct 16, 2024
@miss-islington @encukou
[3.13] gh-125041: test_zlib: For s390x HW acceleration, only skip che…
e3ae564 
…cking the compressed bytes (GH-125042) (#125527)

(cherry picked from commit cc5a225)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
encukou added a commit to encukou/cpython that referenced this pull request Oct 16, 2024
@encukou
pythongh-125041: test_zlib: For s390x HW acceleration, only skip chec…
2819ae2 
…king the compressed bytes (python#125042)

(cherry picked from commit cc5a225)
@bedevere-app
Copy link

bedevere-app bot commented Oct 16, 2024

GH-125577 is a backport of this pull request to the 3.11 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.11 only security fixes label Oct 16, 2024
encukou added a commit to encukou/cpython that referenced this pull request Oct 16, 2024
@encukou
pythongh-125041: pythongh-90781: test_zlib: For s390x HW acceleration…
d522856 
…, skip checking the compressed bytes (pythonGH-125042)

This backports two commits:

- pythonGH-31096 skipped the tests unconditionally
- pythonGH-125042 skips only the possibly-failing assertion

(cherry picked from commit cc5a225)
@encukou encukou mentioned this pull request Oct 16, 2024
Merged
@bedevere-app
Copy link

bedevere-app bot commented Oct 16, 2024

GH-125585 is a backport of this pull request to the 3.10 branch.

encukou added a commit to encukou/cpython that referenced this pull request Oct 16, 2024
@encukou
[3.9] pythongh-125041: pythongh-90781: test_zlib: For s390x HW accele…
21bf2ba 
…ration, skip checking the compressed bytes (pythonGH-125042)

This backports two commits:

- pythonGH-31096 skipped the tests unconditionally
- pythonGH-125042 skips only the possibly-failing assertion

(cherry picked from commit d522856)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
@encukou encukou mentioned this pull request Oct 16, 2024
Open
@bedevere-app
Copy link

bedevere-app bot commented Oct 16, 2024

GH-125587 is a backport of this pull request to the 3.9 branch.

encukou added a commit that referenced this pull request Oct 16, 2024
@miss-islington @encukou
[3.12] gh-125041: test_zlib: For s390x HW acceleration, only skip che…
cbd50a4 
…cking the compressed bytes (GH-125042) (GH-125526)

(cherry picked from commit cc5a225)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
pablogsal pushed a commit that referenced this pull request Oct 22, 2024
@encukou
[3.11] gh-125041: test_zlib: For s390x HW acceleration, only skip che…
8630002 
…cking the compressed bytes (GH-125042) (#125577)

gh-125041: test_zlib: For s390x HW acceleration, only skip checking the compressed bytes (#125042)

(cherry picked from commit cc5a225)
pablogsal pushed a commit that referenced this pull request Oct 22, 2024
@encukou
[3.10] gh-125041: gh-90781: test_zlib: For s390x HW acceleration, ski…
3c63d80 
…p checking the compressed bytes (GH-125042) (#125585)

gh-125041: gh-90781: test_zlib: For s390x HW acceleration, skip checking the compressed bytes (GH-125042)

This backports two commits:

- GH-31096 skipped the tests unconditionally
- GH-125042 skips only the possibly-failing assertion

(cherry picked from commit cc5a225)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rruuaanng rruuaanng rruuaanng left review comments

@vstinner vstinner vstinner approved these changes

Assignees

@encukou encukou

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@encukou @bedevere-bot @vstinner @rruuaanng