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

diff --git a/tests/lib b/tests/lib
index c91020bc3285a3e5545fe0e5d71b3d0340d42e8f..f45dd0b2bb80ecbdec39807d471cac72bf2f531d 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -72,6 +72,14 @@ t-expect-fail () {
                fail "error message not found"
 }
 
+t-expect-push-fail () {
+       local mpat="$1"; shift
+       t-reporefs pre-push
+       t-expect-fail "$mpat"  "$@"
+       t-reporefs post-push
+       diff $tmp/show-refs.{pre,post}-push
+}
+
 t-reporefs () {
        local whichoutput=$1; shift
        local outputfile="$tmp/show-refs.$whichoutput"

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 13567c3f3a7b771ca235af9589fdb5f8524310aa..e80620daafe11233289f6a81727688d193ae6923 100755 (executable)
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -12,13 +12,8 @@ cd $p
 
 mustfail () {
        local mpat="$1"; shift
-       t-reporefs pre-push
-
-       t-expect-fail "$mpat" \
-       git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
-
-       t-reporefs post-push
-       diff $tmp/show-refs.{pre,post}-push
+       t-expect-push-fail "$mpat" \
+       git push origin "$@"
 }
 
 mustsucceed () {