ctdb-tests: 40.vsftpd 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/40.vsftpd.monitor.001.sh b/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh
index fdad12ae9a6c7071a22f3ef3cfcc5ba2d906fd39..00f8180901f98a972c5f8aa28fa3a813549fc1fa 100755 (executable)
--- a/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh
@@ -4,7 +4,7 @@
 
 define_test "not managed, check no-op"
 
-setup_vsftpd "down"
+setup "down"
 
 ok_null
 

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

diff --git a/ctdb/tests/eventscripts/40.vsftpd.shutdown.001.sh b/ctdb/tests/eventscripts/40.vsftpd.shutdown.001.sh
index e37b9e61ff133875b87691c0032ab62ae0356c9a..328e1e49cbf0f2df9ba068ed736a5caaeacfd8d6 100755 (executable)
--- a/ctdb/tests/eventscripts/40.vsftpd.shutdown.001.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.shutdown.001.sh
@@ -4,7 +4,7 @@
 
 define_test "not managed"
 
-setup_vsftpd "down"
+setup "down"
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh b/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
index 21fe06e39f7f142620d4b4e37fc0accd46d9a243..54dc879b91789601e4f0c690b9df82d6d253ecb5 100755 (executable)
--- a/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
@@ -4,8 +4,9 @@
 
 define_test "managed"
 
-setup_vsftpd "up"
-export CTDB_MANAGES_VSFTPD="yes"
+setup "up"
+
+CTDB_MANAGES_VSFTPD="yes"
 
 ok <<EOF
 Stopping vsftpd: OK

diff --git a/ctdb/tests/eventscripts/40.vsftpd.startup.001.sh b/ctdb/tests/eventscripts/40.vsftpd.startup.001.sh
index e37b9e61ff133875b87691c0032ab62ae0356c9a..328e1e49cbf0f2df9ba068ed736a5caaeacfd8d6 100755 (executable)
--- a/ctdb/tests/eventscripts/40.vsftpd.startup.001.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.startup.001.sh
@@ -4,7 +4,7 @@
 
 define_test "not managed"
 
-setup_vsftpd "down"
+setup "down"
 
 ok_null
 simple_test

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

diff --git a/ctdb/tests/eventscripts/scripts/40.vsftpd.sh b/ctdb/tests/eventscripts/scripts/40.vsftpd.sh
index 03c8ec4663a04d83f97ed23ad2af011753d99219..e5ce59e116dee385ba557785a36faeec946aaa00 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/40.vsftpd.sh
+++ b/ctdb/tests/eventscripts/scripts/40.vsftpd.sh
@@ -1,4 +1,4 @@
-setup_vsftpd ()
+setup ()
 {
        debug "Setting up VSFTPD environment: service $1, not managed by CTDB"