ctdb-tests: Do not test "ctdb nodestatus -n all"

This is low value and will no longer be supported.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/tool/stubby.nodestatus.002.sh b/ctdb/tests/tool/stubby.nodestatus.002.sh
index f5b1909a07c3f90739aaf033afba469d10e7ad2f..a3a7a42e4344a5b310783800d42f290a42d2b98a 100755 (executable)
--- a/ctdb/tests/tool/stubby.nodestatus.002.sh
+++ b/ctdb/tests/tool/stubby.nodestatus.002.sh
@@ -2,19 +2,19 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-define_test "-n all, 3 nodes, all OK"
+define_test "all, 3 nodes, 1 disconnected"
 
-required_result 0 <<EOF
+required_result 1 <<EOF
 Number of nodes:3
 pnn:0 192.168.20.41    OK
-pnn:1 192.168.20.42    OK
+pnn:1 192.168.20.42    DISCONNECTED|INACTIVE
 pnn:2 192.168.20.43    OK (THIS NODE)
 EOF
 
 simple_test all <<EOF
 NODEMAP
 0       192.168.20.41   0x0
-1       192.168.20.42   0x0
+1       192.168.20.42   0x1
 2       192.168.20.43   0x0     CURRENT RECMASTER
 
 IFACES

diff --git a/ctdb/tests/tool/stubby.nodestatus.003.sh b/ctdb/tests/tool/stubby.nodestatus.003.sh
deleted file mode 100755 (executable)
index a3a7a42..0000000
--- a/ctdb/tests/tool/stubby.nodestatus.003.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "all, 3 nodes, 1 disconnected"
-
-required_result 1 <<EOF
-Number of nodes:3
-pnn:0 192.168.20.41    OK
-pnn:1 192.168.20.42    DISCONNECTED|INACTIVE
-pnn:2 192.168.20.43    OK (THIS NODE)
-EOF
-
-simple_test all <<EOF
-NODEMAP
-0       192.168.20.41   0x0
-1       192.168.20.42   0x1
-2       192.168.20.43   0x0     CURRENT RECMASTER
-
-IFACES
-:Name:LinkStatus:References:
-:eth2:1:2:
-:eth1:1:4:
-
-VNNMAP
-654321
-0
-1
-2
-EOF

diff --git a/ctdb/tests/tool/stubby.nodestatus.004.sh b/ctdb/tests/tool/stubby.nodestatus.004.sh
deleted file mode 100755 (executable)
index bc98905..0000000
--- a/ctdb/tests/tool/stubby.nodestatus.004.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "-n all, 3 nodes, 1 disconnected"
-
-# -n all asks each node for the node status and 
-#        thus reports THIS NODE for each node
-
-required_result 0 <<EOF
-pnn:0 192.168.20.41    OK (THIS NODE)
-pnn:2 192.168.20.43    OK (THIS NODE)
-EOF
-
-simple_test -n all <<EOF
-NODEMAP
-0       192.168.20.41   0x0
-1       192.168.20.42   0x1
-2       192.168.20.43   0x0     CURRENT RECMASTER
-
-IFACES
-:Name:LinkStatus:References:
-:eth2:1:2:
-:eth1:1:4:
-
-VNNMAP
-654321
-0
-1
-2
-EOF

diff --git a/ctdb/tests/tool/stubby.nodestatus.005.sh b/ctdb/tests/tool/stubby.nodestatus.005.sh
deleted file mode 100755 (executable)
index cb532e7..0000000
--- a/ctdb/tests/tool/stubby.nodestatus.005.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "-n all all, 3 nodes, 1 disconnected"
-
-required_result 1 <<EOF
-Number of nodes:3
-pnn:0 192.168.20.41    OK (THIS NODE)
-pnn:1 192.168.20.42    DISCONNECTED|INACTIVE
-pnn:2 192.168.20.43    OK
-Number of nodes:3
-pnn:0 192.168.20.41    OK
-pnn:1 192.168.20.42    DISCONNECTED|INACTIVE
-pnn:2 192.168.20.43    OK (THIS NODE)
-EOF
-
-simple_test -n all all <<EOF
-NODEMAP
-0       192.168.20.41   0x0
-1       192.168.20.42   0x1
-2       192.168.20.43   0x0     CURRENT RECMASTER
-
-IFACES
-:Name:LinkStatus:References:
-:eth2:1:2:
-:eth1:1:4:
-
-VNNMAP
-654321
-0
-1
-2
-EOF