summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-06-07 14:23:52 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-06-10 18:02:42 +0100
commit9f377842120dd8d6206a3f3f2eb297b3e4907fa8 (patch)
tree63beb7a753292753ba08d7ff1c5ccdcdd583e821 /tests
parente852e5f836f1016c9af35d331b6aacb3afe6a488 (diff)
Test suite: Make t-reporefs stash the output
Diffstat (limited to 'tests')
-rw-r--r--tests/lib5
-rwxr-xr-xtests/tests/drs-push-rejects8
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/lib b/tests/lib
index 5c8293f..776e2a3 100644
--- a/tests/lib
+++ b/tests/lib
@@ -53,8 +53,11 @@ t-expect-fail () {
}
t-reporefs () {
+ local whichoutput=$1; shift
+ local outputfile="$tmp/show-refs.$whichoutput"
(set -e
- if test -d $tmp/git/$p.git; then
+ exec >"$outputfile"
+ if test -d $tmp/git/$p.git; then
cd $tmp/git/$p.git
git show-ref |sort
fi)
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 74ddd37..640aeae 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -12,7 +12,7 @@ cd $p
mustfail () {
local wantmsg="$1"; shift
- t-reporefs >$tmp/show-refs.pre-push
+ t-reporefs pre-push
set +o pipefail
git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
ps="${PIPESTATUS[*]}"
@@ -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