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

ctdb-tests: 20.multipathd 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/20.multipathd.monitor.001.sh b/ctdb/tests/eventscripts/20.multipathd.monitor.001.sh
index 4eafefc60bb..49917654c87 100755
--- a/ctdb/tests/eventscripts/20.multipathd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/20.multipathd.monitor.001.sh
@@ -4,7 +4,7 @@
 
 define_test "No multipath devices configure to check"
 
-setup_multipathd
+setup
 
 ok_null
 
diff --git a/ctdb/tests/eventscripts/20.multipathd.monitor.002.sh b/ctdb/tests/eventscripts/20.multipathd.monitor.002.sh
index fbfe9528430..f57f47604cd 100755
--- a/ctdb/tests/eventscripts/20.multipathd.monitor.002.sh
+++ b/ctdb/tests/eventscripts/20.multipathd.monitor.002.sh
@@ -4,7 +4,7 @@
 
 define_test "3 multipath devices configure to check, all up"
 
-setup_multipathd "mpatha"  "mpathb"  "mpathc"
+setup "mpatha"  "mpathb"  "mpathc"
 
 ok_null
 
diff --git a/ctdb/tests/eventscripts/20.multipathd.monitor.003.sh b/ctdb/tests/eventscripts/20.multipathd.monitor.003.sh
index d9a212555e6..0d768a0139e 100755
--- a/ctdb/tests/eventscripts/20.multipathd.monitor.003.sh
+++ b/ctdb/tests/eventscripts/20.multipathd.monitor.003.sh
@@ -4,7 +4,7 @@
 
 define_test "3 multipath devices configure to check, one down"
 
-setup_multipathd "mpatha"  "!mpathb"  "mpathc"
+setup "mpatha"  "!mpathb"  "mpathc"
 
 required_result 1 <<EOF
 ERROR: multipath device "mpathb" has no active paths
diff --git a/ctdb/tests/eventscripts/20.multipathd.monitor.004.sh b/ctdb/tests/eventscripts/20.multipathd.monitor.004.sh
index 5f45c73c5a8..a655b83ebfb 100755
--- a/ctdb/tests/eventscripts/20.multipathd.monitor.004.sh
+++ b/ctdb/tests/eventscripts/20.multipathd.monitor.004.sh
@@ -4,7 +4,7 @@
 
 define_test "3 multipath devices configure to check, multipath hangs"
 
-setup_multipathd "mpatha"  "!mpathb"  "mpathc"
+setup "mpatha"  "!mpathb"  "mpathc"
 export FAKE_MULTIPATH_HANG="yes"
 
 required_result 1 <<EOF
diff --git a/ctdb/tests/eventscripts/scripts/20.multipathd.sh b/ctdb/tests/eventscripts/scripts/20.multipathd.sh
index 8c4cd8a00eb..472b3a9141c 100644
--- a/ctdb/tests/eventscripts/scripts/20.multipathd.sh
+++ b/ctdb/tests/eventscripts/scripts/20.multipathd.sh
@@ -1,4 +1,4 @@
-setup_multipathd ()
+setup ()
 {
 	_failures=""
 	_devices=""