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 4eafefc60bb07f7b927cf82055bc57a3cb41d5ba..49917654c8781adcd5f6fab31643c1984904eea7 100755 (executable)
--- 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 fbfe952843097013518c7ff43b3292e8162d4a66..f57f47604cd13185388224a57d8b760d41c2fbfa 100755 (executable)
--- 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 d9a212555e649f71bb2a22c2fa11bdc0fc871f15..0d768a0139e08d0393dc6d2559bf3e78ea72a459 100755 (executable)
--- 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 5f45c73c5a83ff86534c703908a01976ace3e9f9..a655b83ebfbfa72ed09e1ba514afac13ea1b8eae 100755 (executable)
--- 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 8c4cd8a00eb5743f70edee89d7232f901244c403..472b3a9141cd1b02dedcfc54b3c6cd72ce54f7ab 100644 (file)
--- 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=""