debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: make test_expect_equal_file() arguments flexible

Browse source 
Before the change, test_expect_equal_file() function treated the first
argument as "actual output file" and the second argument as "expected
output file".  When the test fails, the files are copied for later
inspection.  The first files was copied to "$testname.output" and the
second file to "$testname.expected".  The argument order for
test_expect_equal_file() is often wrong which results in confusing
diff output and incorrectly named files.

The patch solves the issue by changing test_expect_equal_file() to
treat arguments just as two files, without any special properties
(like "actual" and "expected").  The file names for copying is now
based on the given file name: "$testname.$file1" and
"$testname.$file2".  E.g. if test_expect_equal_file() is called with
"OUTPUT" and "EXPECTED", the copied files can be named
"emacs.1.OUTPUT" and "emacs.1.EXPECTED".

The down side of this approach is that diff argument order depends on
test_expect_equal_file() argument order.  So sometimes we get diff
from expected to actual results, and sometimes the other way around.
But the files are always named correctly.
This commit is contained in:
Dmitry Kurochkin 2012-02-01 11:19:54 +04:00 committed by David Bremner
parent c62126238b
commit 1ffb382961
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/README
View file

@ -176,12 +176,12 @@ library for your script to use.
will generate a failure and print the difference of the two will generate a failure and print the difference of the two
strings. strings.
test_expect_equal_file <output> <expected> test_expect_equal_file <file1> <file2>
Identical to test_exepect_equal, except that <output> and Identical to test_exepect_equal, except that <file1> and <file2>
<expected> are files instead of strings. This is a much more are files instead of strings. This is a much more robust method to
robust method to compare formatted textual information, since it compare formatted textual information, since it also notices
also notices whitespace and closing newline differences. whitespace and closing newline differences.
test_debug <script> test_debug <script>

12
test/test-lib.sh
View file

@ -497,17 +497,17 @@ test_expect_equal_file ()
test "$#" = 2 || test "$#" = 2 ||
error "bug in the test script: not 2 or 3 parameters to test_expect_equal" error "bug in the test script: not 2 or 3 parameters to test_expect_equal"
output="$1" file1="$1"
expected="$2" file2="$2"
if ! test_skip "$test_subtest_name" if ! test_skip "$test_subtest_name"
then then
if diff -q "$expected" "$output" >/dev/null ; then if diff -q "$file1" "$file2" >/dev/null ; then
test_ok_ "$test_subtest_name" test_ok_ "$test_subtest_name"
else else
testname=$this_test.$test_count testname=$this_test.$test_count
cp "$output" $testname.output cp "$file1" "$testname.$file1"
cp "$expected" $testname.expected cp "$file2" "$testname.$file2"
test_failure_ "$test_subtest_name" "$(diff -u $testname.expected $testname.output)" test_failure_ "$test_subtest_name" "$(diff -u "$testname.$file1" "$testname.$file2")"
fi fi
fi fi
} }