Test suite: Make t-reporefs stash the output

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

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