Skip to content

Commit

Permalink
Adding make target 'docker-test'.
Browse files Browse the repository at this point in the history
 * test error log check: adding exemptions for log errors expected on debian/archlinux runs
  • Loading branch information
Stefan Eissing committed Jul 10, 2021
1 parent 4d49e08 commit 3ad72b8
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 6 deletions.
12 changes: 7 additions & 5 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
* The test suite now clears Apache's error log on start and checks after
the run if unexpected errors or warnings were logged.
* H2 sessions normally log a warning when the connection is torn down
without them being able to send a last GOAWAY frame. This logging
happens at DEBUG level during the stopping of a child process.
v1.15.22
--------------------------------------------------------------------------------
* Added a timeout to h2 worker cleanup to exit latest after 5 seconds of
waiting on idle workers to terminate. This happens after all connections
have been processed. a WARNING is logged in case workers lagged behind.
This is a stopgap to an underlying issue introduced by the recent
dynamic worker changes.
* H2 sessions normally log a warning when the connection is torn down
without them being able to send a last GOAWAY frame. This logging
happens at DEBUG level during the stopping of a child process.
* `configure` now checks for `apache2ctl` if `apachectl` was not found.
* `configure` now longer errors when no apachectl was found but warns
that the test suite will not work.
* The test suite now clears Apache's error log on start and checks after
the run if unexpected errors or warnings were logged.

v1.15.21
--------------------------------------------------------------------------------
Expand Down
6 changes: 6 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,9 @@ loadtest:

clean-local:
$(MAKE) -C test/ clean

docker-test:
docker-compose build debian-sid
docker-compose build archlinux
docker-compose run debian-sid
docker-compose run archlinux
16 changes: 15 additions & 1 deletion test/e2e/h2_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ def apache_error_log_clear(self):
os.remove(self._server_error_log)

RE_APLOGNO = re.compile(r'.*\[(?P<module>[^:]+):(error|warn)].* (?P<aplogno>AH\d+): .+')
RE_SSL_LIB_ERR = re.compile(r'.*\[ssl:error].* SSL Library Error: error:(?P<errno>\S+):.+')
RE_ERRLOG_ERROR = re.compile(r'.*\[(?P<module>[^:]+):error].*')
RE_ERRLOG_WARN = re.compile(r'.*\[(?P<module>[^:]+):warn].*')

Expand All @@ -317,7 +318,20 @@ def apache_errors_and_warnings(self):
if os.path.isfile(self._server_error_log):
for line in open(self._server_error_log):
m = self.RE_APLOGNO.match(line)
if m and m.group('aplogno') in ['AH02032', 'AH01276', 'AH01630', 'AH00135']:
if m and m.group('aplogno') in [
'AH02032',
'AH01276',
'AH01630',
'AH00135',
'AH02261', # Re-negotiation handshake failed (our test_101
]:
# we know these happen normally in our tests
continue
m = self.RE_SSL_LIB_ERR.match(line)
if m and m.group('errno') in [
'1417A0C1', # cipher suite mismatch, test_101
'1417C0C7', # client cert not accepted, test_101
]:
# we know these happen normally in our tests
continue
m = self.RE_ERRLOG_ERROR.match(line)
Expand Down

0 comments on commit 3ad72b8

Please sign in to comment.