diff options
Diffstat (limited to 'tests/tests/drs-push-rejects')
| -rwxr-xr-x | tests/tests/drs-push-rejects | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects index 5f6d04a..5b450bf 100755 --- a/tests/tests/drs-push-rejects +++ b/tests/tests/drs-push-rejects @@ -10,17 +10,9 @@ t-worktree drs cd $p -reporefs () { - (set -e - if test -d $tmp/git/$p.git; then - cd $tmp/git/$p.git - git show-ref - fi) -} - mustfail () { local wantmsg="$1"; shift - reporefs >$tmp/show-refs.pre-push + t-reporefs >$tmp/show-refs.pre-push set +e git push origin "$@" 2>&1 |tee $tmp/mustfail.txt ps="${PIPESTATUS[*]}" @@ -33,14 +25,14 @@ mustfail () { if ! fgrep "$wantmsg" $tmp/mustfail.txt >/dev/null; then fail "error message not found" fi - reporefs >$tmp/show-refs.post-push + t-reporefs >$tmp/show-refs.post-push diff $tmp/show-refs.{pre,post}-push } mustsucceed () { - reporefs >$tmp/show-refs.pre-push + t-reporefs >$tmp/show-refs.pre-push git push origin "$@" - reporefs >$tmp/show-refs.post-push + t-reporefs >$tmp/show-refs.post-push if diff $tmp/show-refs.{pre,post}-push >$tmp/show-refs.diff; then fail "no refs updated" fi |