ctdb-tests: Use setup_script_options() in 31.clamd tests

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

diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.001.sh b/ctdb/tests/eventscripts/31.clamd.monitor.001.sh
index 24c00489e2db2625b39f15939dc24e742603fec4..85b78edf62e0a415ce17597b0b78fa3f3986ae80 100755 (executable)
--- a/ctdb/tests/eventscripts/31.clamd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/31.clamd.monitor.001.sh
@@ -6,8 +6,10 @@ define_test "Not managed, clamd not listening"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MANAGES_CLAMD=no
 CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+EOF
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.002.sh b/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
index 1994a761abf030d3c1e4e2ae08ed329903f01cbe..744bb92f947d65f7a9fec36fd954a8f9a9b153ca 100755 (executable)
--- a/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
+++ b/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
@@ -6,8 +6,10 @@ define_test "Managed, clamd not listening"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MANAGES_CLAMD=yes
 CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+EOF
 
 required_result 1 <<EOF
 ERROR: clamd not listening on $CTDB_CLAMD_SOCKET

diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.003.sh b/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
index 685e3a90d409fe1247fed85a0b8769fcfa819abc..34a7fe2920f6acd059cffe6e1e3a39d440e46de6 100755 (executable)
--- a/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
+++ b/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
@@ -6,8 +6,10 @@ define_test "Managed, clamd listening"
 
 setup
 
+setup_script_options <<EOF
 CTDB_MANAGES_CLAMD=yes
 CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+EOF
 
 unix_socket_listening "$CTDB_CLAMD_SOCKET"
 

diff --git a/ctdb/tests/eventscripts/scripts/31.clamd.sh b/ctdb/tests/eventscripts/scripts/31.clamd.sh
index ead3c51c9d9c62e9ace4a8a94d68bdbafc272544..65767a0739747ccb41989f12168d6e37d585eeee 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/31.clamd.sh
+++ b/ctdb/tests/eventscripts/scripts/31.clamd.sh
@@ -1,7 +1,10 @@
 setup ()
 {
-       export CTDB_MANAGES_CLAMD="yes"
-       export CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+       setup_script_options <<EOF
+CTDB_MANAGES_CLAMD="yes"
+CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+
+EOF
 
        setup_unix_listen
 }