test: improve known broken tests support

[notmuch] / test / test-lib.sh

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 079d7dba7d2c6eddc3d2e1b596bf3d03839aaea4..196ef49624a64995f2cc83758150deafdf5a8de1 100755 (executable)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -213,16 +213,6 @@ remove_cr () {
        tr '\015' Q | sed -e 's/Q$//'
 }
 
-# Notmuch helper functions
-increment_mtime_amount=0
-increment_mtime ()
-{
-    dir="$1"
-
-    increment_mtime_amount=$((increment_mtime_amount + 1))
-    touch -d "+${increment_mtime_amount} seconds" "$dir"
-}
-
 # Generate a new message in the mail directory, with a unique message
 # ID and subject. The message is not added to the index.
 #
@@ -364,9 +354,6 @@ Date: ${template[date]}
 ${additional_headers}
 ${template[body]}
 EOF
-
-    # Ensure that the mtime of the containing directory is updated
-    increment_mtime "$(dirname "${gen_msg_filename}")"
 }
 
 # Generate a new message and add it to the database.
@@ -409,8 +396,6 @@ emacs_deliver_message ()
           $@
           (message-send-and-exit))" >/dev/null 2>&1
     wait ${smtp_dummy_pid}
-    increment_mtime "$MAIL_DIR"/sent/cur
-    increment_mtime "$MAIL_DIR"/sent/new
     notmuch new >/dev/null
 }
 
@@ -439,6 +424,7 @@ test_begin_subtest ()
        error "bug in test script: Missing test_expect_equal in ${BASH_SOURCE[1]}:${BASH_LINENO[0]}"
     fi
     test_subtest_name="$1"
+    test_subtest_known_broken_=
     # Remember stdout and stderr file descriptors and redirect test
     # output to the previously prepared file descriptors 3 and 4 (see
     # below)
@@ -499,29 +485,6 @@ test_expect_equal_file ()
     fi
 }
 
-test_expect_equal_failure ()
-{
-       exec 1>&6 2>&7          # Restore stdout and stderr
-       inside_subtest=
-       test "$#" = 3 && { prereq=$1; shift; } || prereq=
-       test "$#" = 2 ||
-       error "bug in the test script: not 2 or 3 parameters to test_expect_equal"
-
-       output="$1"
-       expected="$2"
-       if ! test_skip "$@"
-       then
-               if [ "$output" = "$expected" ]; then
-                       test_known_broken_ok_ "$test_subtest_name"
-               else
-                       test_known_broken_failure_ "$test_subtest_name"
-                       testname=$this_test.$test_count
-                       echo "$expected" > $testname.expected
-                       echo "$output" > $testname.output
-               fi
-    fi
-}
-
 NOTMUCH_NEW ()
 {
     notmuch new | grep -v -E -e '^Processed [0-9]*( total)? file|Found [0-9]* total file'
@@ -583,19 +546,31 @@ test_have_prereq () {
 # the text_expect_* functions instead.
 
 test_ok_ () {
+       if test "$test_subtest_known_broken_" = "t"; then
+               test_known_broken_ok_ "$@"
+               return
+       fi
        test_success=$(($test_success + 1))
        say_color pass "%-6s" "PASS"
        echo " $@"
 }
 
 test_failure_ () {
+       if test "$test_subtest_known_broken_" = "t"; then
+               test_known_broken_failure_ "$@"
+               return
+       fi
        test_failure=$(($test_failure + 1))
-       say_color error "%-6s" "FAIL"
-       echo " $1"
-       shift
+       test_failure_message_ "FAIL" "$@"
+       test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; }
+}
+
+test_failure_message_ () {
+       say_color error "%-6s" "$1"
+       echo " $2"
+       shift 2
        echo "$@" | sed -e 's/^/        /'
        if test "$verbose" != "t"; then cat test.output; fi
-       test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; }
 }
 
 test_known_broken_ok_ () {
@@ -606,8 +581,7 @@ test_known_broken_ok_ () {
 
 test_known_broken_failure_ () {
        test_broken=$(($test_broken+1))
-       say_color pass "%-6s" "BROKEN"
-       echo " $@"
+       test_failure_message_ "BROKEN" "$@"
 }
 
 test_debug () {
@@ -651,20 +625,8 @@ test_skip () {
        esac
 }
 
-test_expect_failure () {
-       test "$#" = 3 && { prereq=$1; shift; } || prereq=
-       test "$#" = 2 ||
-       error "bug in the test script: not 2 or 3 parameters to test-expect-failure"
-       if ! test_skip "$@"
-       then
-               test_run_ "$2"
-               if [ "$?" = 0 -a "$eval_ret" = 0 ]
-               then
-                       test_known_broken_ok_ "$1"
-               else
-                       test_known_broken_failure_ "$1"
-               fi
-       fi
+test_subtest_known_broken () {
+       test_subtest_known_broken_=t
 }
 
 test_expect_success () {