diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-06-07 14:24:19 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-06-10 18:28:55 +0100 |
commit | f97a00d63b1d302cb23c5ffb090efea80fd8d42f (patch) | |
tree | 62b753e5701c302c6b0e38f8318f705200a556bf | |
parent | 5d8e32854c1d89e337bc606d423634a667f9b0ff (diff) |
Test suite: Make t-expect-push-fail out of the remains of mustfail
-rw-r--r-- | tests/lib | 8 | ||||
-rwxr-xr-x | tests/tests/drs-push-rejects | 9 |
2 files changed, 10 insertions, 7 deletions
@@ -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 13567c3..e80620d 100755 --- 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 () { |