From e8de58abd7fe7bec7752c6e33ea3e366d3c31a9d Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Thu, 24 Oct 2013 14:15:53 +1100 Subject: tools/onnode: Fix healthy/ok node handling This bit-rotted a long time ago when the "ThisNode" column was added to "ctdb -Y status" output. The fake "ctdb -Y status" output in the test was never updated to reflect this change. Instead of making sure that all columns are "0", just check that they're not "1". This implicitly ignores "Y" and "N" in this "ThisNode" column without having to do anything else clever. Also update associated tests. The main "ctdb ok" test had a duplicate opening line for a here document, which was tickled by this change. This fixes samba bz#8122. Signed-off-by: Martin Schwenke onnode test fixup Signed-off-by: Martin Schwenke (This used to be ctdb commit 01a46205c3a3d6609dc0b0324319b89667dffa32) --- ctdb/tests/onnode/0075.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ctdb/tests/onnode/0075.sh') diff --git a/ctdb/tests/onnode/0075.sh b/ctdb/tests/onnode/0075.sh index 6ce9b9b190e..4276e9c12c8 100755 --- a/ctdb/tests/onnode/0075.sh +++ b/ctdb/tests/onnode/0075.sh @@ -7,11 +7,11 @@ cmd="$ONNODE con hostname" define_test "$cmd" "1st node disconnected" ctdb_set_output <