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.

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

ZTS: Fix zfs_load-key failures on F39 #15550

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Conversation

tonyhutter
Copy link
Contributor

Motivation and Context

Fixes #15534

Description

The zfs_load-key tests were failing on F39 due to their use of the deprecated ssl.wrap_socket function. This commit updates the test to instead use ssl.SSLContext() as described in https://stackoverflow.com/a/65194957.

How Has This Been Tested?

./scripts/zfs-tests.sh -x -T zfs_load-key showed the tests passing after this change.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

The zfs_load-key tests were failing on F39 due to their use of the
deprecated ssl.wrap_socket function.  This commit updates the test to
instead use ssl.SSLContext() as described in
https://stackoverflow.com/a/65194957.

Fixes: openzfs#15534

Signed-off-by: Tony Hutter <hutter2@llnl.gov>
@tonyhutter tonyhutter added Component: Test Suite Indicates an issue with the test framework or a test case Type: Defect Incorrect behavior (e.g. crash, hang) labels Nov 21, 2023
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Component: Test Suite Indicates an issue with the test framework or a test case labels Nov 27, 2023
@behlendorf behlendorf merged commit 3551a32 into openzfs:master Nov 27, 2023
25 of 26 checks passed
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Nov 28, 2023
The zfs_load-key tests were failing on F39 due to their use of the
deprecated ssl.wrap_socket function.  This commit updates the test to
instead use ssl.SSLContext() as described in
https://stackoverflow.com/a/65194957.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes openzfs#15534
Closes openzfs#15550
behlendorf pushed a commit that referenced this pull request Nov 28, 2023
The zfs_load-key tests were failing on F39 due to their use of the
deprecated ssl.wrap_socket function.  This commit updates the test to
instead use ssl.SSLContext() as described in
https://stackoverflow.com/a/65194957.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #15534
Closes #15550
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Dec 12, 2023
The zfs_load-key tests were failing on F39 due to their use of the
deprecated ssl.wrap_socket function.  This commit updates the test to
instead use ssl.SSLContext() as described in
https://stackoverflow.com/a/65194957.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes openzfs#15534
Closes openzfs#15550
behlendorf pushed a commit that referenced this pull request Feb 13, 2024
The zfs_load-key tests were failing on F39 due to their use of the
deprecated ssl.wrap_socket function.  This commit updates the test to
instead use ssl.SSLContext() as described in
https://stackoverflow.com/a/65194957.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #15534
Closes #15550
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested) Type: Defect Incorrect behavior (e.g. crash, hang)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ZTS: "module 'ssl' has no attribute 'wrap_socket'" on F39
2 participants