summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2012-04-19 12:19:02 +1000
committerMartin Schwenke <martin@meltin.net>2012-04-27 15:40:43 +1000
commit72ab31b024072cf73a587e9c0b4501c6f040de14 (patch)
tree4ab17b10be1905e935d351abec04153cb34c92d4
parent4d08afa0beabf2af378880a422d8e7b94780c8e9 (diff)
downloadsamba-72ab31b024072cf73a587e9c0b4501c6f040de14.tar.gz
samba-72ab31b024072cf73a587e9c0b4501c6f040de14.tar.xz
samba-72ab31b024072cf73a587e9c0b4501c6f040de14.zip
tests: Fix trailing whitespace issues in integration.bash
git complains... Signed-off-by: Martin Schwenke <martin@meltin.net> (This used to be ctdb commit d714cf7924674a7a0eb6d585eb74a6a4df26fc12)
-rw-r--r--ctdb/tests/scripts/integration.bash18
1 files changed, 9 insertions, 9 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index ea4ef5cf7e..d38d08d81d 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -131,11 +131,11 @@ ctdb_test_exit_hook_add ()
ctdb_test_usage()
{
local status=${1:-2}
-
+
cat <<EOF
Usage: $0 [option]
-Options:
+Options:
-h, --help show this screen.
-v, --version show test case version.
--category show the test category (ACL, CTDB, Samba ...).
@@ -161,7 +161,7 @@ ctdb_test_cmd_options()
case "$1" in
-h|--help) ctdb_test_usage 0 ;;
-v|--version) ctdb_test_version ;;
- --category) echo "CTDB" ;;
+ --category) echo "CTDB" ;;
-d|--description) test_info ;;
-x) set -x ; return 0 ;;
*)
@@ -174,7 +174,7 @@ ctdb_test_cmd_options()
exit 0
}
-ctdb_test_init ()
+ctdb_test_init ()
{
scriptname=$(basename "$0")
testfailures=0
@@ -329,9 +329,9 @@ wait_until ()
t=$(($t - 1))
sleep 1
done
-
+
echo "*TIMEOUT*"
-
+
return 1
}
@@ -698,7 +698,7 @@ ctdb_start_1 ()
shift # "$@" is passed to ctdbd start.
echo -n "Starting CTDB on node ${pnn}..."
-
+
if [ -n "$CTDB_NODES_SOCKETS" ] ; then
daemons_start_1 $pnn "$@"
else
@@ -904,7 +904,7 @@ case "$1" in
echo "${0}: Healthy again, \"$trigger\" no longer detected"
rm "$detected"
fi
-
+
;;
*)
if [ -e "$timeout_trigger" ] ; then
@@ -913,7 +913,7 @@ case "$1" in
fi
;;
*)
-
+
esac
exit 0