Test suite: Move most of mustfail into t-expect-fail

diff --git a/tests/lib b/tests/lib
index 332bef24414331a9bbd4f2774b1aabca5103dd0c..c91020bc3285a3e5545fe0e5d71b3d0340d42e8f 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -59,10 +59,17 @@ t-expect-fail () {
 
        set +o pipefail
        LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
-       local gotstatus=${PIPESTATUS[0]}
+       local ps="${PIPESTATUS[*]}"
        set -o pipefail
-       test $gotstatus != 0
-       $grepper -e "$mpat" $tmp/t.output ||false
+
+       case $ps in
+       "0 0")  fail "command unexpectedly succeeded (instead of: $mpat)" ;;
+       *" 0")  ;;
+       *)      fail "tee failed"  ;;
+       esac
+
+       $grepper -e "$mpat" $tmp/t.output ||
+               fail "error message not found"
 }
 
 t-reporefs () {

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 640aeae6914cbe8630488b21d3e4be68ad7b3de0..13567c3f3a7b771ca235af9589fdb5f8524310aa 100755 (executable)
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -11,20 +11,12 @@ t-worktree drs
 cd $p
 
 mustfail () {
-       local wantmsg="$1"; shift
+       local mpat="$1"; shift
        t-reporefs pre-push
-       set +o pipefail
+
+       t-expect-fail "$mpat" \
        git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
-       ps="${PIPESTATUS[*]}"
-       set -o pipefail
-       case $ps in
-       "0 0")  fail "push unexpectedly succeeded (instead of: $wantmsg)" ;;
-       *" 0")  ;;
-       *)      fail "tee failed"  ;;
-       esac
-       if ! fgrep "$wantmsg" $tmp/mustfail.txt >/dev/null; then
-               fail "error message not found"
-       fi
+
        t-reporefs post-push
        diff $tmp/show-refs.{pre,post}-push
 }