Test suite: Make t-expect-push-fail out of the remains of mustfail

[dgit.git] / tests / tests / drs-push-rejects

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 5b450bf85cc32efc9acff695643d3cefbfce977b..e80620daafe11233289f6a81727688d193ae6923 100755 (executable)
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -11,28 +11,15 @@ t-worktree drs
 cd $p
 
 mustfail () {
-       local wantmsg="$1"; shift
-       t-reporefs >$tmp/show-refs.pre-push
-       set +e
-       git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
-       ps="${PIPESTATUS[*]}"
-       set -e
-       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 >$tmp/show-refs.post-push
-       diff $tmp/show-refs.{pre,post}-push
+       local mpat="$1"; shift
+       t-expect-push-fail "$mpat" \
+       git push origin "$@"
 }
 
 mustsucceed () {
-       t-reporefs >$tmp/show-refs.pre-push
+       t-reporefs pre-push
        git push origin "$@"
-       t-reporefs >$tmp/show-refs.post-push
+       t-reporefs post-push
        if diff $tmp/show-refs.{pre,post}-push >$tmp/show-refs.diff; then
                fail "no refs updated"
        fi