Changeset 407ca6e in mod_gnutls

Timestamp:

Jan 14, 2020, 4:25:48 PM (9 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

346c03b

Parents:

b22def6

git-author:

Fiona Klute <fiona.klute@…> (01/14/20 06:49:21)

git-committer:

Fiona Klute <fiona.klute@…> (01/14/20 16:25:48)

Message:

TestRequest? and TestReq10: Support request body

This will allow testing e.g. POST requests.

Also remove the redundant repr(self) method in TestReq10, the
inherited method works just fine.

File:

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

test/mgstest/tests.py

@@ -209 +209 @@
     """
     yaml_tag = '!request'
-    def __init__(self, path, method='GET', headers=dict(),
+    def __init__(self, path, method='GET', body=None, headers=dict(),
                  expect=dict(status=200)):
         self.method = method
         self.path = path
+        self.body = body
         self.headers = headers
         self.expect = expect
@@ -218 +219 @@
     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}, body={self.body!r}, '
+                f'headers={self.headers!r}, expect={self.expect!r})')
 
     def run(self, conn, response_log=None):
         try:
-            conn.request(self.method, self.path, headers=self.headers)
+            conn.request(self.method, self.path, body=self.body,
+                         headers=self.headers)
             resp = conn.getresponse()
             if self.expects_conn_reset():
@@ -351 +353 @@
         super().__init__(**kwargs)
 
-    def __repr__(self):
-        return (f'{self.__class__.__name__!s}'
-                f'(method={self.method!r}, path={self.path!r}, '
-                f'headers={self.headers!r}, expect={self.expect!r})')
-
     def run(self, command, timeout=None, conn_log=None, response_log=None):
         req = f'{self.method} {self.path} HTTP/1.0\r\n'
@@ -361 +358 @@
             req = req + f'{name}: {value}\r\n'
         req = req + f'\r\n'
+        if self.body:
+            req = req + self.body
         proc = subprocess.Popen(command,
                                 stdout=subprocess.PIPE,