Changeset e2200db in mod_gnutls for test

Timestamp:

Jan 26, 2020, 1:23:49 PM (12 months 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.

Location:

test

Files:

• mgstest/services.py (modified) (2 diffs)
• runtest.py (modified) (1 diff)

test/mgstest/services.py

@@ -121 +121 @@
 
     def wait_ready(self, timeout=None):
-        """Wait for the started service to be ready. The function passed to
-        the constructor as "check" is called to determine whether it is."""
+        """Wait for the started service to be ready.
+
+        The function passed to the constructor as "check" is called to
+        determine whether it is. Waiting also ends if self.process
+        terminates.
+
+        Returns: None if the service is ready, or the return code if
+        the process has terminated.
+
+        Raises a TimeoutError if the given timeout has been exceeded.
+
+        """
         if not self.check:
-            return
+            return None
 
         slept = 0
         while not timeout or slept < timeout:
+            if self.process and self.process.poll():
+                return self.process.returncode
             if self.check():
-                return
+                return None
             else:
                 sleep(self._step)
@@ -165 +177 @@
                  valgrind_log=None):
         self.config = Path(config).resolve()
-        self.forking = True
         base_cmd = [self.apache2, '-f', str(self.config), '-k']
-        start_cmd = base_cmd + ['start']
-        stop_cmd = base_cmd + ['stop']
+        start_cmd = base_cmd + ['start', '-DFOREGROUND']
         if valgrind_log:
             start_cmd = ['valgrind', '-s', '--leak-check=full',
                          '--track-origins=yes', '--vgdb=no',
                          f'--log-file={valgrind_log}'] \
-                         + start_cmd + ['-DFOREGROUND']
-            self.forking = False
+                         + start_cmd
         if not check:
             check = self.pidfile_check
         super(ApacheService, self).__init__(start=start_cmd,
-                                            stop=stop_cmd,
-                                            forking=self.forking,
+                                            stop=base_cmd + ['stop'],
+                                            forking=False,
                                             env=env,
                                             pidfile=pidfile,

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