Changeset 096859f in mod_gnutls for test

Timestamp:

Dec 1, 2019, 10:14:18 AM (15 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

8335f8c

Parents:

a4e136a

Message:

https-test-client.py: Check if the HTTP body contains certain strings

There are a few test cases where we currently only check the end of
the returned body. Searching for certain strings within the body
instead of expecting a full match allows them to work with the
Python-based test client.

Location:

test

Files:

• .gitignore (modified) (1 diff)
• https-test-client.py (modified) (2 diffs)
• sample_test.yml (modified) (1 diff)

test/.gitignore

@@ -6 +6 @@
 authority/client/uid
 authority/tofu.db
+/__pycache__/
 
 # generated X.509 data

test/https-test-client.py

@@ -77 +77 @@
     def __repr__(self):
         return (f'{self.__class__.__name__!s}(path={self.path!r}, '
-                f'method={self.method!r}), headers={self.headers!r}, '
-                f'expect={self.expect!r}')
+                f'method={self.method!r}, headers={self.headers!r}, '
+                f'expect={self.expect!r})')
+
+    def _check_body(self, body):
+        """
+        >>> r1 = TestRequest(path='/test.txt', method='GET', headers={}, expect={'status': 200, 'body': {'exactly': 'test\\n'}})
+        >>> r1._check_body('test\\n')
+        >>> r1._check_body('xyz\\n')
+        Traceback (most recent call last):
+        ...
+        https-test-client.TestExpectationFailed: Unexpected body: 'xyz\\n' != 'test\\n'
+        >>> r2 = TestRequest(path='/test.txt', method='GET', headers={}, expect={'status': 200, 'body': {'contains': ['tes', 'est']}})
+        >>> r2._check_body('test\\n')
+        >>> r2._check_body('est\\n')
+        Traceback (most recent call last):
+        ...
+        https-test-client.TestExpectationFailed: Unexpected body: 'est\\n' does not contain 'tes'
+        >>> r3 = TestRequest(path='/test.txt', method='GET', headers={}, expect={'status': 200, 'body': {'contains': 'test'}})
+        >>> r3._check_body('test\\n')
+        """
+        if 'exactly' in self.expect['body'] \
+           and body != self.expect['body']['exactly']:
+            raise TestExpectationFailed(
+                f'Unexpected body: {body!r} != '
+                f'{self.expect["body"]["exactly"]!r}')
+        if 'contains' in self.expect['body']:
+            if type(self.expect['body']['contains']) is str:
+                self.expect['body']['contains'] = [
+                    self.expect['body']['contains']]
+            for s in self.expect['body']['contains']:
+                if not s in body:
+                    raise TestExpectationFailed(
+                        f'Unexpected body: {body!r} does not contain '
+                        f'{s!r}')
 
     def check_response(self, response, body):
@@ -85 +117 @@
                 f'Unexpected status: {response.status} != '
                 f'{self.expect["status"]}')
-        if 'body' in self.expect and self.expect['body'] != body:
-            raise TestExpectationFailed(
-                f'Unexpected body: {body!r} != {self.expect["body"]!r}')
+        if 'body' in self.expect:
+            self._check_body(body)
 
     @classmethod

test/sample_test.yml

@@ -14 +14 @@
     expect:
       status: 200
-      body: |
-        test
+      body:
+        exactly: |
+          test
+  - !request
+    path: /test.txt
+    expect:
+      status: 200
+      body:
+        contains:
+          - 'tes'
+          - 'est'