Changeset ce85a5f in mod_gnutls for test

Timestamp:

Dec 4, 2019, 9:36:10 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

2e736df

Parents:

851173b

git-author:

Fiona Klute <fiona.klute@…> (12/04/19 09:19:25)

git-committer:

Fiona Klute <fiona.klute@…> (12/04/19 09:36:10)

Message:

Move code to run a TestRequest? into the class

File:

• test/https-test-client.py (modified) (2 diffs)

test/https-test-client.py

@@ -112 +112 @@
                 f'method={self.method!r}, headers={self.headers!r}, '
                 f'expect={self.expect!r})')
+
+    def run(self, conn):
+        try:
+            conn.request(self.method, self.path, headers=self.headers)
+            resp = conn.getresponse()
+        except ConnectionResetError as err:
+            if self.expects_conn_reset():
+                print('connection reset as expected.')
+                return
+            else:
+                raise err
+        body = resp.read().decode()
+        print(format_response(resp, body))
+        self.check_response(resp, body)
 
     def _check_body(self, body):
@@ -376 +390 @@
         for act in test_actions:
             if type(act) is TestRequest:
-                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))
-                act.check_response(resp, body)
+                act.run(conn)
             elif type(act) is TestRaw10:
                 act.run(command, conn.timeout)