diff options
| author | Martin Schwenke <martin@meltin.net> | 2011-08-30 14:20:38 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2011-08-30 16:51:55 +1000 |
| commit | af1a0245b6d39d2ff6a4be40fa912adb79a70b7d (patch) | |
| tree | fa3a89f04b1c43bc762e657f0d2316ce02deb100 | |
| parent | 3167f50b6c978dda9175b740eca1487fba161ac0 (diff) | |
| download | samba-af1a0245b6d39d2ff6a4be40fa912adb79a70b7d.tar.gz samba-af1a0245b6d39d2ff6a4be40fa912adb79a70b7d.tar.xz samba-af1a0245b6d39d2ff6a4be40fa912adb79a70b7d.zip | |
Tests - eventscripts - output format tweaks
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 8f8dc5636436db28ce7d0edd706a4adf2624e71b)
| -rw-r--r-- | ctdb/tests/eventscripts/common.sh | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/ctdb/tests/eventscripts/common.sh b/ctdb/tests/eventscripts/common.sh index 4c80a95868..2d91740f0e 100644 --- a/ctdb/tests/eventscripts/common.sh +++ b/ctdb/tests/eventscripts/common.sh @@ -668,25 +668,24 @@ result_print () if [ -n "$_iteration" ] ; then cat <<EOF -################################################## -################################################## +================================================== Iteration $_iteration EOF fi cat <<EOF -################################################## +-------------------------------------------------- Output (Exit status: ${_rc}): -################################################## +-------------------------------------------------- $_out EOF fi if ! $_passed ; then cat <<EOF -################################################## +-------------------------------------------------- Required output (Exit status: ${required_rc}): -################################################## +-------------------------------------------------- $required_output EOF fi @@ -699,20 +698,19 @@ result_footer () if [ "$EVENTSCRIPT_TESTS_VERBOSE" = "yes" ] || ! $_passed ; then cat <<EOF -################################################## +-------------------------------------------------- CTDB_BASE="$CTDB_BASE" CTDB_ETCDIR="$CTDB_ETCDIR" ctdb client is "$(which ctdb)" -################################################## +-------------------------------------------------- EOF fi - echo - if $_passed ; then echo "PASSED" return 0 else + echo echo "FAILED" return 1 fi @@ -732,7 +730,7 @@ simple_test () { [ -n "$event" ] || die 'simple_test: $event not set' - echo "Running \"${CTDB_BASE}/events.d/$script $event\"" + echo "Running \"$script $event $*\"" _out=$($EVENTSCRIPTS_TESTS_TRACE "${CTDB_BASE}/events.d/$script" "$event" "$@" 2>&1) _rc=$? @@ -788,7 +786,7 @@ iterate_test () _setup_default="$2" shift 2 - echo "Running $_repeats iterations of \"${CTDB_BASE}/events.d/$script $event\" $args" + echo "Running $_repeats iterations of \"$script $event\" $args" _result=true |