From 051458feb0208dd3cee1fed074d84e40fb5e65ea Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Thu, 22 Mar 2018 07:11:59 +1100
Subject: [PATCH] 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>
---
 ctdb/tests/eventscripts/31.clamd.monitor.001.sh | 2 ++
 ctdb/tests/eventscripts/31.clamd.monitor.002.sh | 2 ++
 ctdb/tests/eventscripts/31.clamd.monitor.003.sh | 2 ++
 ctdb/tests/eventscripts/scripts/31.clamd.sh     | 7 +++++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.001.sh b/ctdb/tests/eventscripts/31.clamd.monitor.001.sh
index 24c00489e2db..85b78edf62e0 100755
--- 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 1994a761abf0..744bb92f947d 100755
--- 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 685e3a90d409..34a7fe2920f6 100755
--- 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 ead3c51c9d9c..65767a073974 100644
--- 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
 }
-- 
2.34.1