From 504de9874faa31e6e2fa44213f2acb3ae5fd643a Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Tue, 2 Jun 2020 15:37:42 -0400
Subject: [PATCH] More systemctl reset attempts for travis

---
 tests/suites/_mgmt-functions.sh  | 4 ++--
 tests/suites/management-users.sh | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/suites/_mgmt-functions.sh b/tests/suites/_mgmt-functions.sh
index 88baa1b4..c63108e4 100644
--- a/tests/suites/_mgmt-functions.sh
+++ b/tests/suites/_mgmt-functions.sh
@@ -81,7 +81,7 @@ mgmt_rest() {
 }
 
 systemctl_reset() {
-	local service="${1:-nsd.service}"
+	local service="$1"
 	# for travis-ci: reset nsd to avoid "nsd.service: Start request
 	# repeated too quickly", which occurs inside kick() of the
 	# management flask app when "system restart nsd" is called on
@@ -104,7 +104,7 @@ mgmt_create_user() {
 	mgmt_rest POST /admin/mail/users/add "email=$email" "password=$pass"
 	rc=$?
 	if echo "$REST_OUTPUT" | grep "updated DNS:" >/dev/null; then
-		systemctl_reset
+		systemctl_reset "nsd.service"
 	fi
 	return $rc
 }
diff --git a/tests/suites/management-users.sh b/tests/suites/management-users.sh
index 0a6ef5dd..5fb0e99d 100644
--- a/tests/suites/management-users.sh
+++ b/tests/suites/management-users.sh
@@ -202,6 +202,9 @@ test_intl_domains() {
 
 suite_start "management-users" mgmt_start
 
+# for travis-ci
+systemctl_reset "nsd.service"
+
 test_mixed_case_users
 test_mixed_case_domains
 test_intl_domains