Changeset e3e0de1 in mod_gnutls for test/mgstest/tests.py

Timestamp:

Dec 7, 2019, 9:42:07 AM (12 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

8b72599

Parents:

09d923b

Message:

https-test-client.py: Make host and port configurable per connection

Both variables can use environment variables. If unset they default to
TEST_TARGET and TEST_PORT. This makes it possible to connect to
different servers in one test, for example in proxy tests to check
that the backend server is behaving as expected.

File:

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

test/mgstest/tests.py

@@ -21 +21 @@
 """
 
+import os
 import re
 import subprocess
 import yaml
+
+from string import Template
 
 from . import TestExpectationFailed
@@ -42 +45 @@
     yaml_tag = '!connection'
 
-    def __init__(self, actions, gnutls_params=[], transport='gnutls'):
+    def __init__(self, actions, host=None, port=None, gnutls_params=[],
+                 transport='gnutls'):
         self.gnutls_params = gnutls_params
         self.actions = actions
         self.transport = transport
+        if host:
+            self.host = subst_env(host)
+        else:
+            self.host = os.environ.get('TEST_TARGET', 'localhost')
+        if port:
+            self.port = int(subst_env(port))
+        else:
+            self.port = int(os.environ.get('TEST_PORT', 8000))
 
     def __repr__(self):
         return (f'{self.__class__.__name__!s}'
-                f'(gnutls_params={self.gnutls_params!r}, '
+                f'(host={self.host!r}, port={self.port!r}, '
+                f'gnutls_params={self.gnutls_params!r}, '
                 f'actions={self.actions!r}, transport={self.transport!r})')
 
-    def run(self, host, port, timeout=5.0):
+    def run(self, timeout=5.0):
         # note: "--logfile" option requires GnuTLS version >= 3.6.7
         command = ['gnutls-cli', '--logfile=/dev/stderr']
         for s in self.gnutls_params:
             command.append('--' + s)
-        command = command + ['-p', str(port), host]
-
-        conn = HTTPSubprocessConnection(command, host, port,
+        command = command + ['-p', str(self.port), self.host]
+
+        conn = HTTPSubprocessConnection(command, self.host, self.port,
                                         output_filter=filter_cert_log,
                                         timeout=timeout)
@@ -322 +335 @@
     s = s + '\n\n' + body
     return s
+
+
+
+def subst_env(text):
+    t = Template(text)
+    return t.substitute(os.environ)