Changeset e2200db in mod_gnutls for test/runtest.py


Ignore:
Timestamp:
Jan 26, 2020, 1:23:49 PM (15 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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/runtest.py

    r72ebe64 re2200db  
    169169
    170170        # special case: expected to fail in a few cases
    171         try:
    172             service_stack.enter_context(apache.run())
    173             if os.path.exists(os.path.join(testdir, 'fail.server')):
    174                 raise TestExpectationFailed(
    175                     'Server start did not fail as expected!')
    176             apache.wait_ready()
    177         except subprocess.CalledProcessError as e:
    178             if os.path.exists(os.path.join(testdir, 'fail.server')):
     171        service_stack.enter_context(apache.run())
     172        failed = apache.wait_ready()
     173        if os.path.exists(os.path.join(testdir, 'fail.server')):
     174            if failed:
    179175                print('Apache server failed to start as expected',
    180176                      file=sys.stderr)
    181177            else:
    182                 raise e
     178                raise TestExpectationFailed(
     179                    'Server start did not fail as expected!')
    183180
    184181        # Set TEST_TARGET for the request. Might be replaced with a
Note: See TracChangeset for help on using the changeset viewer.