Changeset 019ab8e in mod_gnutls

Timestamp:

Dec 1, 2019, 1:30:59 PM (11 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

dec05c4

Parents:

8335f8c

Message:

https-test-client.py: Catch expected connection errors

Location:

test

Files:

• https-test-client.py (modified) (3 diffs)
• sample_fail.yml (added)

test/https-test-client.py

@@ -113 +113 @@
 
     def check_response(self, response, body):
+        if self.expects_conn_reset():
+            raise TestExpectationFailed(
+                'Got a response, but connection should have failed!')
         if response.status != self.expect['status']:
             raise TestExpectationFailed(
@@ -119 +122 @@
         if 'body' in self.expect:
             self._check_body(body)
+
+    def expects_conn_reset(self):
+        if 'reset' in self.expect:
+            return self.expect['reset']
+        return False
 
     @classmethod
@@ -227 +235 @@
         for act in test_actions:
             if type(act) is TestRequest:
-                # Add headers={'Host': 'test.host'} to provoke "421
-                # Misdirected
-                conn.request(act.method, act.path, headers=act.headers)
-                resp = conn.getresponse()
+                try:
+                    conn.request(act.method, act.path, headers=act.headers)
+                    resp = conn.getresponse()
+                except ConnectionResetError as err:
+                    if act.expects_conn_reset():
+                        print('connection reset as expected.')
+                        break
+                    else:
+                        raise err
                 body = resp.read().decode()
                 print(format_response(resp, body))