ctdb-tests: 31.clamd event script setup modularisation

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 bd97057ec7b39840d952040755f34923602ef85e..24c00489e2db2625b39f15939dc24e742603fec4 100755 (executable)
--- a/ctdb/tests/eventscripts/31.clamd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/31.clamd.monitor.001.sh
@@ -4,10 +4,10 @@
 
 define_test "Not managed, clamd not listening"
 
-export CTDB_MANAGES_CLAMD=no
-export CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+setup
 
-setup_generic
+CTDB_MANAGES_CLAMD=no
+CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
 
 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 bfd763403a9ff235af069e2a8e0447089a27b404..1994a761abf030d3c1e4e2ae08ed329903f01cbe 100755 (executable)
--- a/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
+++ b/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
@@ -4,10 +4,10 @@
 
 define_test "Managed, clamd not listening"
 
-export CTDB_MANAGES_CLAMD=yes
-export CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+setup
 
-setup_generic
+CTDB_MANAGES_CLAMD=yes
+CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
 
 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 e57f02580c3004a037dd3396c24cd59d7431a91e..685e3a90d409fe1247fed85a0b8769fcfa819abc 100755 (executable)
--- a/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
+++ b/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
@@ -4,10 +4,10 @@
 
 define_test "Managed, clamd listening"
 
-export CTDB_MANAGES_CLAMD=yes
-export CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+setup
 
-setup_generic
+CTDB_MANAGES_CLAMD=yes
+CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
 
 unix_socket_listening "$CTDB_CLAMD_SOCKET"
 

diff --git a/ctdb/tests/eventscripts/scripts/31.clamd.sh b/ctdb/tests/eventscripts/scripts/31.clamd.sh
new file mode 100644 (file)
index 0000000..ead3c51
--- /dev/null
+++ b/ctdb/tests/eventscripts/scripts/31.clamd.sh
@@ -0,0 +1,7 @@
+setup ()
+{
+       export CTDB_MANAGES_CLAMD="yes"
+       export CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+
+       setup_unix_listen
+}

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 75f882515a083112fd13c98d11d470ac34ddf0f3..b29f976e1ed0cb1a4ef7fd737439038eb86d662e 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -91,7 +91,7 @@ setup_generic ()
     setup_dbdir
     setup_date
 
-    export FAKE_TCP_LISTEN FAKE_NETSTAT_UNIX_LISTEN
+    export FAKE_TCP_LISTEN
 }
 
 tcp_port_down ()
@@ -102,6 +102,11 @@ tcp_port_down ()
     done
 }
 
+setup_unix_listen ()
+{
+       export FAKE_NETSTAT_UNIX_LISTEN="$*"
+}
+
 unix_socket_listening ()
 {
        _s="$1"