From: Martin Schwenke <martin@meltin.net>
Date: Tue, 8 Mar 2016 02:32:35 +0000 (+1100)
Subject: ctdb-tests: Re-indent and re-format some functions
X-Git-Tag: tdb-1.3.9~458
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=032809828567c677b80d9760f67c345a8d250037;p=thirdparty%2Fsamba.git

ctdb-tests: Re-indent and re-format some functions

This makes the next commit much easier to read.

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

diff --git a/ctdb/tests/complex/scripts/local.bash b/ctdb/tests/complex/scripts/local.bash
index 2dd62a8fef1..103a71f5919 100644
--- a/ctdb/tests/complex/scripts/local.bash
+++ b/ctdb/tests/complex/scripts/local.bash
@@ -121,25 +121,28 @@ tcpdump_start ()
 # By default, wait for 1 matching packet.
 tcpdump_wait ()
 {
-    local count="${1:-1}"
-    local filter="${2:-${tcpdump_filter}}"
-
-    tcpdump_check ()
-    {
-	local found=$(tcpdump -n -r $tcpdump_filename "$filter" 2>/dev/null | wc -l)
-	[ $found -ge $count ]
-    }
-
-    echo "Waiting for tcpdump to capture some packets..."
-    if ! wait_until 30 tcpdump_check ; then
-	echo "DEBUG AT $(date '+%F %T'):"
-	local i
-	for i in "onnode -q 0 $CTDB status" "netstat -tanp" "tcpdump -n -e -r $tcpdump_filename" ; do
-	    echo "$i"
-	    $i || true
-	done
-	return 1
-    fi
+	local count="${1:-1}"
+	local filter="${2:-${tcpdump_filter}}"
+
+	tcpdump_check ()
+	{
+		local found=$(tcpdump -n -r $tcpdump_filename \
+				      "$filter" 2>/dev/null | wc -l)
+		[ $found -ge $count ]
+	}
+
+	echo "Waiting for tcpdump to capture some packets..."
+	if ! wait_until 30 tcpdump_check ; then
+		echo "DEBUG AT $(date '+%F %T'):"
+		local i
+		for i in "onnode -q 0 $CTDB status" \
+				 "netstat -tanp" \
+				 "tcpdump -n -e -r $tcpdump_filename" ; do
+			echo "$i"
+			$i || true
+		done
+		return 1
+	fi
 }
 
 tcpdump_show ()
@@ -193,10 +196,10 @@ tcptickle_sniff_start ()
 
 tcptickle_sniff_wait_show ()
 {
-    tcpdump_wait 1 "$tcptickle_reset"
+	tcpdump_wait 1 "$tcptickle_reset"
 
-    echo "GOOD: here are some TCP tickle packets:"
-    tcpdump_show
+	echo "GOOD: here are some TCP tickle packets:"
+	tcpdump_show
 }
 
 gratarp4_sniff_start ()