diff options
| author | Martin Schwenke <martin@meltin.net> | 2011-08-22 16:07:36 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2011-08-30 16:51:55 +1000 |
| commit | 5574b3b6fed7c5e611b57faba796a64b41e6ccb6 (patch) | |
| tree | b4e79c07f99a6bd6caca3c3356c6575c4ea4fc42 | |
| parent | 58687f52be4636b5ad2432e349c82641fef5b4b3 (diff) | |
| download | samba-5574b3b6fed7c5e611b57faba796a64b41e6ccb6.tar.gz samba-5574b3b6fed7c5e611b57faba796a64b41e6ccb6.tar.xz samba-5574b3b6fed7c5e611b57faba796a64b41e6ccb6.zip | |
Tests - eventscripts - add some output filtering
This allows $OUT_FILTER to be set to one or more sed commands to
filter eventscript output. This allows expected output to be
generalised.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit a1d424045c53f5b148952eade6161af8248ed4df)
| -rw-r--r-- | ctdb/tests/eventscripts/common.sh | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ctdb/tests/eventscripts/common.sh b/ctdb/tests/eventscripts/common.sh index a2bcd830c9..0c605e7f45 100644 --- a/ctdb/tests/eventscripts/common.sh +++ b/ctdb/tests/eventscripts/common.sh @@ -708,7 +708,13 @@ simple_test () _out=$($EVENTSCRIPTS_TESTS_TRACE "${CTDB_BASE}/events.d/$script" "$event" "$@" 2>&1) _rc=$? - if [ "$_out" = "$required_output" -a $_rc = $required_rc ] ; then + if [ -n "$OUT_FILTER" ] ; then + _fout=$(echo "$_out" | eval sed -r $OUT_FILTER) + else + _fout="$_out" + fi + + if [ "$_fout" = "$required_output" -a $_rc = $required_rc ] ; then _passed=true else _passed=false @@ -770,7 +776,13 @@ iterate_test () _out=$($EVENTSCRIPTS_TESTS_TRACE "${CTDB_BASE}/events.d/$script" "$event" $args 2>&1) _rc=$? - if [ "$_out" = "$required_output" -a $_rc = $required_rc ] ; then + if [ -n "$OUT_FILTER" ] ; then + _fout=$(echo "$_out" | eval sed -r $OUT_FILTER) + else + _fout="$_out" + fi + + if [ "$_fout" = "$required_output" -a $_rc = $required_rc ] ; then _passed=true else _passed=false |