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 42f8836021a8e3a6d9f33b5f9fcaa0b34bf18573..82c6b5020a4908e20c8ed8cbc16422bf29e1fdff 100644 (file)
--- 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 03dd271d031daa5cb0054e7db9450e03f52421df..ba0c870c67b6c3fd57f5ba26b2962a1bde6c8ed7 100644 (file)
--- 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