From: Martin Schwenke <martin@meltin.net>
Date: Mon, 29 Jul 2019 05:45:41 +0000 (+1000)
Subject: ctdb-tests: Inline handling of recovered and notlmaster statuses
X-Git-Tag: tevent-0.10.1~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb59073515ee5f7886b5d9a20d7b2805857c2708;p=thirdparty%2Fsamba.git

ctdb-tests: Inline handling of recovered and notlmaster statuses

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14085

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

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index c4d5179d902..a81f2a022eb 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -322,7 +322,7 @@ node_has_status ()
 	local pnn="$1"
 	local status="$2"
 
-	local bits rpat
+	local bits
 	case "$status" in
 	unhealthy)    bits="?|?|?|1|*" ;;
 	healthy)      bits="?|?|?|0|*" ;;
@@ -334,8 +334,16 @@ node_has_status ()
 	enabled)      bits="?|?|0|*" ;;
 	stopped)      bits="?|?|?|?|1|*" ;;
 	notstopped)   bits="?|?|?|?|0|*" ;;
-	recovered)    rpat='^Recovery mode:RECOVERY \(1\)$' ;;
-	notlmaster)   rpat="^hash:.* lmaster:${pnn}\$" ;;
+	recovered)
+		! $CTDB status -n "$pnn" | \
+			grep -Eq '^Recovery mode:RECOVERY \(1\)$'
+		return
+		;;
+	notlmaster)
+		! $CTDB status -n "$pnn" | \
+			grep -Eq "^hash:.* lmaster:${pnn}\$"
+		return
+		;;
 	*)
 		echo "node_has_status: unknown status \"$status\""
 		return 1
@@ -358,10 +366,8 @@ node_has_status ()
 			done
 			return 1
 		} <<<"$out" # Yay bash!
-	elif [ -n "$rpat" ] ; then
-		! $CTDB status -n "$pnn" | egrep -q "$rpat"
 	else
-		echo 'node_has_status: unknown mode, neither $bits nor $rpat is set'
+		echo 'node_has_status: unknown mode, $bits not set'
 		return 1
 	fi
 }