summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2017-10-25 21:43:56 +1100
committerAmitay Isaacs <amitay@samba.org>2017-10-26 09:35:25 +0200
commit274fef9b843aa1726c9d331a876504bc0a96a322 (patch)
treecc0640970f8fd1c9fece1e333998651eff033c91 /ctdb
parentdcbaebc232b49e6a64228f1bb7ce7cfc5d2120e2 (diff)
downloadsamba-274fef9b843aa1726c9d331a876504bc0a96a322.tar.gz
ctdb-tests: Skip starting fake_ctdbd when current node is disconnected
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13097 Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
-rwxr-xr-xctdb/tests/tool/ctdb.getcapabilities.003.sh13
-rwxr-xr-xctdb/tests/tool/ctdb.lvs.008.sh13
2 files changed, 14 insertions, 12 deletions
diff --git a/ctdb/tests/tool/ctdb.getcapabilities.003.sh b/ctdb/tests/tool/ctdb.getcapabilities.003.sh
index 91d38b8c9e3..74702d5b5e7 100755
--- a/ctdb/tests/tool/ctdb.getcapabilities.003.sh
+++ b/ctdb/tests/tool/ctdb.getcapabilities.003.sh
@@ -10,12 +10,13 @@ setup_nodes <<EOF
192.168.20.43
EOF
-setup_ctdbd <<EOF
-NODEMAP
-0 192.168.20.41 0x1 CURRENT RECMASTER
-1 192.168.20.42 0x0
-2 192.168.20.43 0x0
-EOF
+# Don't setup ctdbd - disconnected on current node
+#setup_ctdbd <<EOF
+#NODEMAP
+#0 192.168.20.41 0x1 CURRENT RECMASTER
+#1 192.168.20.42 0x0
+#2 192.168.20.43 0x0
+#EOF
required_result 1 <<EOF
connect() failed, errno=2
diff --git a/ctdb/tests/tool/ctdb.lvs.008.sh b/ctdb/tests/tool/ctdb.lvs.008.sh
index a0e24b14afd..6cdd702c57c 100755
--- a/ctdb/tests/tool/ctdb.lvs.008.sh
+++ b/ctdb/tests/tool/ctdb.lvs.008.sh
@@ -13,12 +13,13 @@ EOF
setup_lvs <<EOF
EOF
-setup_ctdbd <<EOF
-NODEMAP
-0 192.168.20.41 0x1 CURRENT RECMASTER
-1 192.168.20.42 0x0
-2 192.168.20.43 0x0
-EOF
+# Don't setup ctdbd - disconnected on current node
+#setup_ctdbd <<EOF
+#NODEMAP
+#0 192.168.20.41 0x1 CURRENT RECMASTER
+#1 192.168.20.42 0x0
+#2 192.168.20.43 0x0
+#EOF
#####