diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-11-15 12:22:05 +1100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-11-27 18:46:17 +0100 |
| commit | 8ca117a68e525db57623ce529690b24c45afa1e3 (patch) | |
| tree | 22eefc08a9e6a6c5c62ec9dd52aedc2dfa66bc8a /ctdb/tests/eventscripts/scripts | |
| parent | 97554854439e83ebb9e99ce4ebb6e49de8e7a5a9 (diff) | |
ctdb:tests: Rework unit test result filtering
Using a variable is too fragile, so use a function instead.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'ctdb/tests/eventscripts/scripts')
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index 4c3f0b1394..2b4bc92046 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -1012,11 +1012,7 @@ iterate_test () _out=$($_shell "${CTDB_BASE}/events.d/$script" "$event" $args 2>&1) _rc=$? - if [ -n "$OUT_FILTER" ] ; then - _fout=$(echo "$_out" | eval sed -r $OUT_FILTER) - else - _fout="$_out" - fi + _fout=$(echo "$_out" | result_filter) if [ "$_fout" = "$required_output" -a $_rc = $required_rc ] ; then _passed=true |