From ceca4a3cff40cd98a6198026ec6ad9ff53b76ae8 Mon Sep 17 00:00:00 2001 From: downtownallday Date: Tue, 2 Jun 2020 23:27:24 -0400 Subject: [PATCH] again --- .travis.yml | 4 +++- tests/suites/_mgmt-functions.sh | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e7495bb..850cc1a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,9 @@ install: - sudo ./setup/start.sh -v script: - - sudo sed -i 's|-d|-d -6 -N 1 -n 1|' /etc/systemd/system/multi-user.target.wants/nsd.service + - sudo find / -name nsd.service + - sudo sed -i 's|-d|-d -4 -p 5053|' /etc/systemd/system/multi-user.target.wants/nsd.service + - sudo sed -i 's|-d|-d -4 -p 5053|' /lib/systemd/system/nsd.service - sudo systemctl daemon-reload - sudo systemctl restart nsd - sudo systemctl status -l nsd diff --git a/tests/suites/_mgmt-functions.sh b/tests/suites/_mgmt-functions.sh index 1d42b123..c6c406fd 100644 --- a/tests/suites/_mgmt-functions.sh +++ b/tests/suites/_mgmt-functions.sh @@ -63,7 +63,13 @@ mgmt_rest() { [ -z "$REST_HTTP_CODE" ] && REST_HTTP_CODE="000" if [ $code -ne 0 ]; then - if [ $code -ne 16 -o $REST_HTTP_CODE -ne 200 ]; then + if [ $code -eq 56 -a $REST_HTTP_CODE -eq 200 ]; then + # this is okay, I guess. happens sometimes during + # POST /admin/mail/aliases/remove + # 56=Unexpected EOF + record "Ignoring curl return code 56 due to 200 status" + + elif [ $code -ne 16 -o $REST_HTTP_CODE -ne 200 ]; then REST_ERROR="CURL failed with code $code" record "${F_DANGER}$REST_ERROR${F_RESET}" record "$output"