Skip to content

Commit b19f973

Browse files
committed
Webstandard should not fail on 403 errors
Those were not found before as we only tested a subset. Also removed a forgotten debug statement. Also added one additional field to ignore as the low contrast is by design.
1 parent 7858e80 commit b19f973

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.github/jobs/webstandard.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ if [ $RET -ne 4 ] && [ $RET -ne 0 ] && [ $RET -ne 8 ]; then
7676
exit $RET
7777
fi
7878

79-
EXPECTED_HTTP_CODES="200\|302\|400\|404"
79+
EXPECTED_HTTP_CODES="200\|302\|400\|404\|403"
8080
if [ "$ROLE" = "public" ]; then
8181
# It's expected to encounter a 401 for the login page as we supply the wrong password
8282
EXPECTED_HTTP_CODES="$EXPECTED_HTTP_CODES\|401"
@@ -87,7 +87,6 @@ set -e
8787
echo "$NUM_ERRORS"
8888
8989
if [ "$NUM_ERRORS" -ne 0 ]; then
90-
echo "Entered the if"
9190
grep -v "HTTP/1.1\" \($EXPECTED_HTTP_CODES\)" /var/log/nginx/domjudge.log | grep -v "robots.txt"
9291
exit 1
9392
fi
@@ -133,7 +132,9 @@ else
133132
FLTR=""
134133
else
135134
STAN="-s $TEST"
136-
FLTR="-E '#DataTables_Table_0 > tbody > tr > td > a','#menuDefault > a','#filter-card > div > div > div > span > span:nth-child(1) > span > ul > li > input',.problem-badge"
135+
FLTR0="-E '#DataTables_Table_0 > tbody > tr > td > a','#menuDefault > a','#filter-card > div > div > div > span > span:nth-child(1) > span > ul > li > input',.problem-badge"
136+
FLTR1="'html > body > div > div > div > div > div > div > table > tbody > tr > td > a > span'"
137+
FLTR="$FLTR0,$FLTR1"
137138
fi
138139
chown -R domjudge:domjudge "$DIR"
139140
cd "$DIR"

0 commit comments

Comments
 (0)