ctdb-tests: Use setup_script_options() in 41.httpd tests

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

diff --git a/ctdb/tests/eventscripts/41.httpd.monitor.002.sh b/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
index 6266b143189bb4f44122c3afbc8066ba5a8b62c3..c2238a5820eb3bb2d61b4a5f11062a667a561f50 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
@@ -6,7 +6,9 @@ define_test "managed, down - 5 times"
 
 setup "down"
 
+setup_script_options <<EOF
 CTDB_MANAGES_HTTPD="yes"
+EOF
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh b/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
index 726254cf771fae04b04d1e9dcedecb7d5a389d26..79a33a458599bcb286a89a9138f77a891b536fc5 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
@@ -6,7 +6,9 @@ define_test "managed"
 
 setup "up"
 
+setup_script_options <<EOF
 CTDB_MANAGES_HTTPD="yes"
+EOF
 
 ok <<EOF
 Stopping httpd: OK

diff --git a/ctdb/tests/eventscripts/41.httpd.startup.002.sh b/ctdb/tests/eventscripts/41.httpd.startup.002.sh
index e83ca0d3433ba2c1b7ead8637e781cc39da6d033..0e5c0cf3f1f4e3171e3bf7d13511c88f45565431 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.startup.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.startup.002.sh
@@ -6,7 +6,9 @@ define_test "managed"
 
 setup "down"
 
+setup_script_options <<EOF
 CTDB_MANAGES_HTTPD="yes"
+EOF
 
 ok <<EOF
 Starting httpd: OK

diff --git a/ctdb/tests/eventscripts/scripts/41.httpd.sh b/ctdb/tests/eventscripts/scripts/41.httpd.sh
index 7af8a88e9c0363b1d5a74cddeab3d41be167fec1..4061d0f606160981c9f92d1ea92c19bf71c94f64 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/41.httpd.sh
+++ b/ctdb/tests/eventscripts/scripts/41.httpd.sh
@@ -12,5 +12,7 @@ setup ()
                done
        fi
 
-       export CTDB_MANAGES_HTTPD=""
+       setup_script_options <<EOF
+CTDB_MANAGES_HTTPD=""
+EOF
 }