Changeset bdf5917 in mod_gnutls

Timestamp:

Jan 5, 2020, 3:52:55 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

0b3733d

Parents:

fa14c32

git-author:

Fiona Klute <fiona.klute@…> (01/05/20 03:40:46)

git-committer:

Fiona Klute <fiona.klute@…> (01/05/20 03:52:55)

Message:

TestReq10: Implement checking expected headers

File:

• test/mgstest/tests.py (modified) (3 diffs)

test/mgstest/tests.py

@@ -329 +329 @@
     """
     yaml_tag = '!request10'
-    status_re = re.compile('^HTTP/([\d\.]+) (\d+) (.*)$')
+    status_re = re.compile(r'^HTTP/([\d\.]+) (\d+) (.*)$')
+    header_re = re.compile(r'^([-\w]+):\s+(.*)$')
 
     def __init__(self, **kwargs):
@@ -364 +365 @@
         status, rest = outs.decode().split('\r\n', maxsplit=1)
         # headers and body are separated by double newline
-        headers, body = rest.split('\r\n\r\n', maxsplit=1)
+        head, body = rest.split('\r\n\r\n', maxsplit=1)
         # log response for debugging
-        print(f'{status}\n{headers}\n\n{body}')
+        print(f'{status}\n{head}\n\n{body}')
         if response_log:
-            print(f'{status}\n{headers}\n\n{body}', file=response_log)
+            print(f'{status}\n{head}\n\n{body}', file=response_log)
 
         m = self.status_re.match(status)
@@ -380 +381 @@
         else:
             raise TestExpectationFailed(f'Invalid status line: "{status}"')
+
+        if 'headers' in self.expect:
+            headers = dict()
+            for line in head.splitlines():
+                m = self.header_re.fullmatch(line)
+                if m:
+                    headers[m.group(1)] = m.group(2)
+            self.check_headers(headers)
 
         if 'body' in self.expect: