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 94030a1d79263e0a53a8bd2b80237bf9506ddba0..de637759f12f96120380245dc36764af79fdf2dd 100755 (executable)
--- 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 5ba71db94a6add3c9fde8a1a10db3c831b19c847..83c83d34c245b77e40abc79792fa3ff384e94b05 100755 (executable)
--- 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 2c35917f42408d1643a8b3347cf6b0af5b621b1d..a626163d3b9d1c7093ac0d014cd437f02654d649 100644 (file)
--- 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