Skip to content

Commit cebc27a

Browse files
committed
Fix tests
1 parent 6690452 commit cebc27a

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

tests/.lib.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,22 +154,23 @@ test_vhost_response() {
154154
test_docker_logs_err() {
155155
local container_name="${1}"
156156

157-
local re_internal_upper='(\[FAILURE|FAILED|FAIL|FATAL|ERROR|ERR|WARNING|WARN\])'
158-
local re_internal_lower='(\[failure|failed|fail|fatal|error|err|warning|warn\])'
159-
local re_upper='(FAULT|FAIL|FATAL|ERR|WARN)'
160-
local re_lower='(segfault|fail|fatal|warn)'
157+
local re_internal_upper='(\[(FAILURE|FAILED|FAIL|FATAL|ERROR|ERR|WARNING|WARN)\])'
158+
local re_internal_lower='(\[(failure|failed|fail|fatal|error|err|warning|warn)\])'
159+
local re_upper='(FAULT|FAIL|FATAL|ERROR|WARN)'
160+
local re_lower='(segfault|fail|fatal|error|warn)'
161161
local re_mixed='([Ss]egfault|[Ff]ail|[Ff]atal|[Ww]arn)'
162162
local regex="${re_internal_upper}|${re_internal_lower}|${re_upper}|${re_lower}|${re_mixed}"
163163

164164
# Ignore this pattern
165165
local ignore1='creating Certificate Authority'
166166
local ignore2='error_log' # nginx error log directive
167167
local ignore3='LogLevel' # Apache logging directive
168-
local ignore4='# Possible values' # Apache httpd.conf contains a comment with verbosity levels
169-
local ignore5='# consult the online' # Apache httpd.conf contains a comment with warning
170-
local ignore6='stackoverflow' # contains a link comment with 'error' in url
171-
local ignore7='\[warn\] NameVirtualHost' # Apache specific, when massvhost projects are not yet loaded
172-
local ignore="${ignore1}|${ignore2}|${ignore3}|${ignore4}|${ignore5}|${ignore6}|${ignore7}"
168+
local ignore4='ErrorLog' # Apache error log directive
169+
local ignore5='# Possible values' # Apache httpd.conf contains a comment with verbosity levels
170+
local ignore6='# consult the online' # Apache httpd.conf contains a comment with warning
171+
local ignore7='stackoverflow' # contains a link comment with 'error' in url
172+
local ignore8='\[warn\] NameVirtualHost' # Apache specific, when massvhost projects are not yet loaded
173+
local ignore="${ignore1}|${ignore2}|${ignore3}|${ignore4}|${ignore5}|${ignore6}|${ignore7}|${ignore8}"
173174

174175
#local clr_gray="\033[38;5;244m"
175176
local clr_test="\033[0;34m" # blue

0 commit comments

Comments
 (0)