Changeset 1a85a3d in mod_gnutls

Timestamp:

Apr 7, 2020, 2:27:05 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

b0695c6

Parents:

e60e3b9

Message:

mgstest.tests.TestConnection?: Read environment variables at runtime

Previously environment variables were evaluated during init, which
has confusing results if environment variables are changed (e.g. in a
prepare_env hook) between the time the configuration is read and the
test runs.

File:

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

test/mgstest/tests.py

@@ -140 +140 @@
         self.transport = Transports[transport.upper()]
         self.description = description
-        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))
+        self.host = host
+        self.port = port
 
     def __repr__(self):
@@ -158 +152 @@
     def run(self, timeout=5.0, conn_log=None, response_log=None):
         """Set up an HTTP connection and run the configured actions."""
+
+        if self.host:
+            self.host = subst_env(self.host)
+        else:
+            self.host = os.environ.get('TEST_TARGET', 'localhost')
+        if self.port:
+            self.port = int(subst_env(self.port))
+        else:
+            self.port = int(os.environ.get('TEST_PORT', 8000))
 
         # note: "--logfile" option requires GnuTLS version >= 3.6.7