From: Martin Schwenke <martin@meltin.net>
Date: Mon, 12 Feb 2018 02:47:56 +0000 (+1100)
Subject: ctdb-tests: 40.vsftpd event script setup modularisation
X-Git-Tag: talloc-2.1.13~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99c3fd3460da162d8c66e837ef42f28de48dd8fe;p=thirdparty%2Fsamba.git

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 fdad12ae9a6..00f8180901f 100755
--- 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 6ffed59bfcb..796a3c7249b 100755
--- 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 e37b9e61ff1..328e1e49cbf 100755
--- 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 21fe06e39f7..54dc879b917 100755
--- 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 e37b9e61ff1..328e1e49cbf 100755
--- 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 d1b560b1b66..9ee26e8acf2 100755
--- 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 03c8ec4663a..e5ce59e116d 100644
--- 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"