Changeset e2200db in mod_gnutls for test/runtest.py

Timestamp:

Jan 26, 2020, 1:23:49 PM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

264ab17

Parents:

72ebe64

Message:

Test suite: Always run Apache with "-DFOREGROUND"

This simplifies process management a lot.

File:

• test/runtest.py (modified) (1 diff)

test/runtest.py

@@ -169 +169 @@
 
         # special case: expected to fail in a few cases
-        try:
-            service_stack.enter_context(apache.run())
-            if os.path.exists(os.path.join(testdir, 'fail.server')):
-                raise TestExpectationFailed(
-                    'Server start did not fail as expected!')
-            apache.wait_ready()
-        except subprocess.CalledProcessError as e:
-            if os.path.exists(os.path.join(testdir, 'fail.server')):
+        service_stack.enter_context(apache.run())
+        failed = apache.wait_ready()
+        if os.path.exists(os.path.join(testdir, 'fail.server')):
+            if failed:
                 print('Apache server failed to start as expected',
                       file=sys.stderr)
             else:
-                raise e
+                raise TestExpectationFailed(
+                    'Server start did not fail as expected!')
 
         # Set TEST_TARGET for the request. Might be replaced with a