ctdb-tests: Use setup_script_options() in 40.vsftpd tests

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

diff --git a/ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh b/ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh
index 796a3c7249b1fbe96c4d4d9c3106300210d09c19..be22b4ce3cfc32e067478a242a21d7f35899b1a6 100755 (executable)
--- a/ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh
@@ -6,7 +6,9 @@ define_test "managed, down - once, twice"
 
 setup "down"
 
+setup_script_options <<EOF
 CTDB_MANAGES_VSFTPD="yes"
+EOF
 
 ok <<EOF
 vsftpd not listening on TCP port 21

diff --git a/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh b/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
index 54dc879b91789601e4f0c690b9df82d6d253ecb5..106a009daeed101554179f8fffed172401bb590d 100755 (executable)
--- a/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
@@ -6,7 +6,9 @@ define_test "managed"
 
 setup "up"
 
+setup_script_options <<EOF
 CTDB_MANAGES_VSFTPD="yes"
+EOF
 
 ok <<EOF
 Stopping vsftpd: OK

diff --git a/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh b/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh
index 9ee26e8acf253df20d7113017586dfa1cb9dfb15..4b889d11fda3062b2ad84cd1d24b372b48d91d9e 100755 (executable)
--- a/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh
@@ -6,7 +6,9 @@ define_test "managed"
 
 setup "down"
 
+setup_script_options <<EOF
 CTDB_MANAGES_VSFTPD="yes"
+EOF
 
 ok <<EOF
 Starting vsftpd: OK

diff --git a/ctdb/tests/eventscripts/scripts/40.vsftpd.sh b/ctdb/tests/eventscripts/scripts/40.vsftpd.sh
index e5ce59e116dee385ba557785a36faeec946aaa00..2d2300804fc16875307e7e973dd64630c2879d33 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/40.vsftpd.sh
+++ b/ctdb/tests/eventscripts/scripts/40.vsftpd.sh
@@ -10,5 +10,7 @@ setup ()
                service "$_service_name" force-stopped
        fi
 
-       export CTDB_MANAGES_VSFTPD=""
+       setup_script_options <<EOF
+CTDB_MANAGES_VSFTPD=""
+EOF
 }