From: Stefan Eissing <icing@apache.org>
Date: Thu, 26 Aug 2021 11:10:06 +0000 (+0000)
Subject: test/modules/http2:
X-Git-Tag: 2.5.0-alpha2-ci-test-only~852
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1a714d7cdf667b4c739fad274810085b220c714;p=thirdparty%2Fapache%2Fhttpd.git

test/modules/http2:
  * removing unneeded python imports for smaller footprint
  * fixing bug in waiting for stopped server to no longer
    accept new connections.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1892615 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/modules/http2/h2_certs.py b/test/modules/http2/h2_certs.py
index 42f8836021a..82c6b5020a4 100644
--- a/test/modules/http2/h2_certs.py
+++ b/test/modules/http2/h2_certs.py
@@ -15,9 +15,6 @@ from cryptography.x509 import ExtendedKeyUsageOID, NameOID
 
 EC_SUPPORTED = {}
 EC_SUPPORTED.update([(curve.name.upper(), curve) for curve in [
-    ec.BrainpoolP256R1,
-    ec.BrainpoolP384R1,
-    ec.BrainpoolP512R1,
     ec.SECP192R1,
     ec.SECP224R1,
     ec.SECP256R1,
diff --git a/test/modules/http2/h2_env.py b/test/modules/http2/h2_env.py
index 03dd271d031..ba0c870c67b 100644
--- a/test/modules/http2/h2_env.py
+++ b/test/modules/http2/h2_env.py
@@ -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