From: Martin Schwenke <martin@meltin.net>
Date: Wed, 10 Feb 2010 09:27:53 +0000 (+1100)
Subject: Test suite: Make "ctdb ip" test backward compatible with older ctdb versions.
X-Git-Tag: tevent-0.9.20~348^2~1586
X-Git-Url: http://git.samba.org/samba.git/?p=vlendec%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=47bebba8fecdfcfada81d37011eb519e574f93cd;hp=-c

Test suite: Make "ctdb ip" test backward compatible with older ctdb versions.

Recent updates to the test meant that it only worked with the latest
ctdb versions.  This changes things so that we never bother matching
the machine readable header, just the actual data in the output.  It
also takes a slightly more liberal approach in massaging the human
readable output to ensure it matches the machine readable output.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 8a1cb5dc1ddf82f3b9cbb23e40b3914b3d5c2783)
---

47bebba8fecdfcfada81d37011eb519e574f93cd
diff --git a/ctdb/tests/simple/11_ctdb_ip.sh b/ctdb/tests/simple/11_ctdb_ip.sh
index 59c5d52eac4..e85884541a9 100755
--- a/ctdb/tests/simple/11_ctdb_ip.sh
+++ b/ctdb/tests/simple/11_ctdb_ip.sh
@@ -32,21 +32,14 @@ set -e
 cluster_is_healthy
 
 echo "Getting list of public IPs..."
-try_command_on_node -v 1 $CTDB ip -n all
+try_command_on_node -v 1 "$CTDB ip -n all | tail -n +2"
 ips=$(echo "$out" | sed \
-	-e '1d' \
 	-e 's@ node\[@ @' \
-	-e 's@\].*$@:@')
-machineout1=":Public IP:Node:ActiveInterface:AvailableInterfaces:ConfiguredInterfaces:"
-machineout2=$(echo "$out" | sed \
-	-e '1d' \
-	-e 's@^@:@' \
-	-e 's@ node\[@:@' \
-	-e 's@\] active\[@:@' \
-	-e 's@\] available\[@:@' \
-	-e 's@\] configured\[@:@' \
-	-e 's@\]$@:@')
-machineout=`echo -e "$machineout1\n$machineout2"`
+	-e 's@\].*$@@')
+machineout=$(echo "$out" | sed -r \
+	-e 's@^| |$@:@g' \
+	-e 's@[[:alpha:]]+\[@@g' \
+	-e 's@\]@@g')
 
 while read ip pnn ; do
     try_command_on_node $pnn "ip addr show"
@@ -60,7 +53,7 @@ done <<<"$ips" # bashism to avoid problem setting variable in pipeline.
 
 [ "$testfailures" != 1 ] && echo "Looks good!"
 
-cmd="$CTDB -Y ip -n all"
+cmd="$CTDB -Y ip -n all | tail -n +2"
 echo "Checking that \"$cmd\" produces expected output..."
 
 try_command_on_node 1 "$cmd"