ctdb-tests: Add machinereadable output tests

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

diff --git a/ctdb/tests/tool/ctdb.nodestatus.001.sh b/ctdb/tests/tool/ctdb.nodestatus.001.sh
index d97892e9639dd88a2ce8235297c4fb8f70d828c0..2217afcc0b983ad33c6b7cd131dbe1bc29a5cc53 100755 (executable)
--- a/ctdb/tests/tool/ctdb.nodestatus.001.sh
+++ b/ctdb/tests/tool/ctdb.nodestatus.001.sh
@@ -22,5 +22,12 @@ pnn:0 192.168.20.41    OK
 pnn:1 192.168.20.42    OK
 pnn:2 192.168.20.43    OK (THIS NODE)
 EOF
-
 simple_test all
+
+required_result 0 <<EOF
+|Node|IP|Disconnected|Banned|Disabled|Unhealthy|Stopped|Inactive|PartiallyOnline|ThisNode|
+|0|192.168.20.41|0|0|0|0|0|0|0|N|
+|1|192.168.20.42|0|0|0|0|0|0|0|N|
+|2|192.168.20.43|0|0|0|0|0|0|0|Y|
+EOF
+simple_test -X all

diff --git a/ctdb/tests/tool/ctdb.nodestatus.002.sh b/ctdb/tests/tool/ctdb.nodestatus.002.sh
index 3f8d6935dc21d3f174e4a57494e6a63471ddfefc..c1706fd98e750dda29db301b4d14e3f8e5e6d9e1 100755 (executable)
--- a/ctdb/tests/tool/ctdb.nodestatus.002.sh
+++ b/ctdb/tests/tool/ctdb.nodestatus.002.sh
@@ -22,5 +22,12 @@ 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
+
+required_result 1 <<EOF
+|Node|IP|Disconnected|Banned|Disabled|Unhealthy|Stopped|Inactive|PartiallyOnline|ThisNode|
+|0|192.168.20.41|0|0|0|0|0|0|0|N|
+|1|192.168.20.42|1|0|0|0|0|1|0|N|
+|2|192.168.20.43|0|0|0|0|0|0|0|Y|
+EOF
+simple_test -X all

diff --git a/ctdb/tests/tool/ctdb.status.001.sh b/ctdb/tests/tool/ctdb.status.001.sh
index ed324cd77c625560871213198f54e7d45b177b70..13324ef0dd9352a994bb11049c7f351377044fad 100755 (executable)
--- a/ctdb/tests/tool/ctdb.status.001.sh
+++ b/ctdb/tests/tool/ctdb.status.001.sh
@@ -35,5 +35,12 @@ hash:2 lmaster:2
 Recovery mode:NORMAL (0)
 Recovery master:0
 EOF
-
 simple_test
+
+required_result 0 <<EOF
+|Node|IP|Disconnected|Banned|Disabled|Unhealthy|Stopped|Inactive|PartiallyOnline|ThisNode|
+|0|192.168.20.41|0|0|0|0|0|0|0|Y|
+|1|192.168.20.42|0|0|0|0|0|0|0|N|
+|2|192.168.20.43|0|0|0|0|0|0|0|N|
+EOF
+simple_test -X

diff --git a/ctdb/tests/tool/ctdb.status.002.sh b/ctdb/tests/tool/ctdb.status.002.sh
index 233847170df7c52c4c4697085d0b46e3cd077058..3fd8d1cf711496722f859f9c8ed4d24d0a4dee40 100755 (executable)
--- a/ctdb/tests/tool/ctdb.status.002.sh
+++ b/ctdb/tests/tool/ctdb.status.002.sh
@@ -35,5 +35,12 @@ hash:2 lmaster:2
 Recovery mode:NORMAL (0)
 Recovery master:1
 EOF
-
 simple_test
+
+required_result 0 <<EOF
+|Node|IP|Disconnected|Banned|Disabled|Unhealthy|Stopped|Inactive|PartiallyOnline|ThisNode|
+|0|192.168.20.41|0|0|0|1|0|0|0|N|
+|1|192.168.20.42|0|0|0|0|0|0|0|Y|
+|2|192.168.20.43|0|0|0|0|0|0|0|N|
+EOF
+simple_test -X