You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2021/08/26 11:10:06 UTC
svn commit: r1892615 - in /httpd/httpd/trunk/test/modules/http2: h2_certs.py
h2_env.py
Author: icing
Date: Thu Aug 26 11:10:06 2021
New Revision: 1892615
URL: http://svn.apache.org/viewvc?rev=1892615&view=rev
Log:
test/modules/http2:
* removing unneeded python imports for smaller footprint
* fixing bug in waiting for stopped server to no longer
accept new connections.
Modified:
httpd/httpd/trunk/test/modules/http2/h2_certs.py
httpd/httpd/trunk/test/modules/http2/h2_env.py
Modified: httpd/httpd/trunk/test/modules/http2/h2_certs.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/h2_certs.py?rev=1892615&r1=1892614&r2=1892615&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/h2_certs.py (original)
+++ httpd/httpd/trunk/test/modules/http2/h2_certs.py Thu Aug 26 11:10:06 2021
@@ -15,9 +15,6 @@ from cryptography.x509 import ExtendedKe
EC_SUPPORTED = {}
EC_SUPPORTED.update([(curve.name.upper(), curve) for curve in [
- ec.BrainpoolP256R1,
- ec.BrainpoolP384R1,
- ec.BrainpoolP512R1,
ec.SECP192R1,
ec.SECP224R1,
ec.SECP256R1,
Modified: httpd/httpd/trunk/test/modules/http2/h2_env.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/h2_env.py?rev=1892615&r1=1892614&r2=1892615&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/h2_env.py (original)
+++ httpd/httpd/trunk/test/modules/http2/h2_env.py Thu Aug 26 11:10:06 2021
@@ -395,11 +395,9 @@ class H2TestEnv:
while datetime.now() < try_until:
try:
req = requests.Request('HEAD', url).prepare()
- s.send(req, verify=self._verify_certs, timeout=timeout)
+ s.send(req, verify=self._verify_certs, timeout=int(timeout.total_seconds()))
time.sleep(.2)
- except IOError:
- return True
- except:
+ except IOError as ex:
return True
log.debug("Server still responding after %d sec", timeout)
return False