From: Martin Schwenke <martin@meltin.net>
Date: Thu, 22 Mar 2018 00:17:47 +0000 (+1100)
Subject: ctdb-tests: Use setup_script_options() in 49.winbind tests
X-Git-Tag: talloc-2.1.13~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecda38c8940de073dc7de8894bc77eabb1cf4001;p=thirdparty%2Fsamba.git

ctdb-tests: Use setup_script_options() in 49.winbind tests

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh b/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
index 94030a1d792..de637759f12 100755
--- a/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
@@ -6,7 +6,9 @@ define_test "managed"
 
 setup "up"
 
+setup_script_options <<EOF
 CTDB_MANAGES_WINBIND="yes"
+EOF
 
 ok <<EOF
 Stopping winbind: OK
diff --git a/ctdb/tests/eventscripts/49.winbind.startup.002.sh b/ctdb/tests/eventscripts/49.winbind.startup.002.sh
index 5ba71db94a6..83c83d34c24 100755
--- a/ctdb/tests/eventscripts/49.winbind.startup.002.sh
+++ b/ctdb/tests/eventscripts/49.winbind.startup.002.sh
@@ -6,7 +6,9 @@ define_test "managed"
 
 setup "down"
 
+setup_script_options <<EOF
 CTDB_MANAGES_WINBIND="yes"
+EOF
 
 ok <<EOF
 Starting winbind: OK
diff --git a/ctdb/tests/eventscripts/scripts/49.winbind.sh b/ctdb/tests/eventscripts/scripts/49.winbind.sh
index 2c35917f424..a626163d3b9 100644
--- a/ctdb/tests/eventscripts/scripts/49.winbind.sh
+++ b/ctdb/tests/eventscripts/scripts/49.winbind.sh
@@ -8,7 +8,9 @@ setup ()
 
 		service "winbind" force-started
 
-		export CTDB_MANAGES_WINBIND="yes"
+		setup_script_options <<EOF
+CTDB_MANAGES_WINBIND="yes"
+EOF
 
 		export FAKE_WBINFO_FAIL="no"
 
@@ -17,7 +19,9 @@ setup ()
 
 		service "winbind" force-stopped
 
-		export CTDB_MANAGES_WINBIND=""
+		setup_script_options <<EOF
+CTDB_MANAGES_WINBIND=""
+EOF
 
 		export FAKE_WBINFO_FAIL="yes"
 	fi