Fix shell tests to handle timestamps (Paired with Stewart).

This commit is contained in:
Robert Collins 2012-01-26 16:07:09 +13:00
parent 25581a35bb
commit 29021cef8d
2 changed files with 7 additions and 7 deletions

2
NEWS
View File

@ -10,7 +10,7 @@ IMPROVEMENTS
* Perl module now correctly outputs "failure" instead of "fail". (Stewart Smith)
* Shell functions now output timestamps. (Stewart Smith)
* Shell functions now output timestamps. (Stewart Smith, Robert Collins)
BUG FIXES
~~~~~~~~~

View File

@ -27,7 +27,7 @@
. ${SHELL_SHARE}subunit.sh
echo 'test: subunit_start_test output'
func_output=$(subunit_start_test "foo bar")
func_output=$(subunit_start_test "foo bar"|grep -v 'time:')
func_status=$?
if [ $func_status == 0 -a "x$func_output" = "xtest: foo bar" ]; then
echo 'success: subunit_start_test output'
@ -40,7 +40,7 @@ else
fi
subunit_start_test "subunit_pass_test output"
func_output=$(subunit_pass_test "foo bar")
func_output=$(subunit_pass_test "foo bar"|grep -v 'time:')
func_status=$?
if [ $func_status == 0 -a "x$func_output" = "xsuccess: foo bar" ]; then
subunit_pass_test "subunit_pass_test output"
@ -53,12 +53,12 @@ else
fi
subunit_start_test "subunit_fail_test output"
func_output=$(subunit_fail_test "foo bar" <<END
func_output=$((subunit_fail_test "foo bar" <<END
something
wrong
here
END
)
)|grep -v 'time:')
func_status=$?
if [ $func_status == 0 -a "x$func_output" = "xfailure: foo bar [
something
@ -75,12 +75,12 @@ else
fi
subunit_start_test "subunit_error_test output"
func_output=$(subunit_error_test "foo bar" <<END
func_output=$((subunit_error_test "foo bar" <<END
something
died
here
END
)
)| grep -v 'time:')
func_status=$?
if [ $func_status == 0 -a "x$func_output" = "xerror: foo bar [
something