[Python-checkins] gh-100454: Start running SSL tests with OpenSSL 3.1.0-beta1 (#100456)

Fri Dec 23 21:04:26 EST 2022

https://github.com/python/cpython/commit/a23cb72ac82372fac05ba36ce08923840ca0de06
commit: a23cb72ac82372fac05ba36ce08923840ca0de06
branch: main
author: Illia Volochii <illia.volochii at gmail.com>
committer: gpshead <greg at krypto.org>
date: 2022年12月23日T18:04:20-08:00
summary:
gh-100454: Start running SSL tests with OpenSSL 3.1.0-beta1 (#100456)
files:
A Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst
M .github/workflows/build.yml
M Tools/ssl/multissltests.py

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a1bdfa0681e0..f798992d8af6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -235,7 +235,7 @@ jobs:
 strategy:
 fail-fast: false
 matrix:
- openssl_ver: [1.1.1s, 3.0.7]
+ openssl_ver: [1.1.1s, 3.0.7, 3.1.0-beta1]
 env:
 OPENSSL_VER: ${{ matrix.openssl_ver }}
 MULTISSL_DIR: ${{ github.workspace }}/multissl
diff --git a/Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst b/Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst
new file mode 100644
index 000000000000..8b08ca0dcef7
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst
@@ -0,0 +1 @@
+Start running SSL tests with OpenSSL 3.1.0-beta1.
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 30d66964fd1d..5ad597c8347e 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -402,15 +402,15 @@ class BuildOpenSSL(AbstractBuilder):
 depend_target = 'depend'
 
 def _post_install(self):
- if self.version.startswith("3.0"):
- self._post_install_300()
+ if self.version.startswith("3."):
+ self._post_install_3xx()
 
 def _build_src(self, config_args=()):
- if self.version.startswith("3.0"):
+ if self.version.startswith("3."):
 config_args += ("enable-fips",)
 super()._build_src(config_args)
 
- def _post_install_300(self):
+ def _post_install_3xx(self):
 # create ssl/ subdir with example configs
 # Install FIPS module
 self._subprocess_call(
