Compare commits

...

2 Commits

Author SHA1 Message Date
Michal Nowak
58c47fe1c7 Do not retry resolution_fails() on timeout.
Timeout is an appropriate positive response in resolution_fails().
Retries break the test, which counts "sending packet to 10.53.0.7" lines
in ns1/named.run.
2023-04-05 16:03:31 +02:00
Michal Nowak
22c6ab6502 Run legacy system test in a loop 2023-04-05 16:03:31 +02:00
2 changed files with 2 additions and 2 deletions

View File

@@ -313,7 +313,7 @@ stages:
- *setup_interfaces
script:
- cd bin/tests/system
- make -j${TEST_PARALLEL_JOBS:-1} -k check V=1
- while make check V=1 TESTS=legacy; do true; done
- if git rev-parse > /dev/null 2>&1; then ( ! grep "^I:.*:file.*not removed$" *.log ); fi
- '( ! grep -F "grep: warning:" *.log )'
after_script:

View File

@@ -32,7 +32,7 @@ resolution_succeeds() {
resolution_fails() {
_servfail=0
_timeout=0
$DIG $DIGOPTS +tcp +tries=3 +time=5 @10.53.0.1 ${1} TXT > dig.out.test$n
$DIG $DIGOPTS +tcp +time=5 @10.53.0.1 ${1} TXT > dig.out.test$n
grep -F "status: SERVFAIL" dig.out.test$n > /dev/null && _servfail=1
grep -F "timed out" dig.out.test$n > /dev/null && _timeout=1
if [ $_servfail -eq 1 ] || [ $_timeout -eq 1 ]; then