tests: drs-push-rejects: introduce and use "mustsucceed"

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

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 9b2a08b46d5362fff27279801d85ff9ef416962c..67e0dfbea2c908355d020f8178f25cfa11d2a34a 100755 (executable)
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -10,8 +10,17 @@ 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
        set +e
        git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
        ps="${PIPESTATUS[*]}"
@@ -24,6 +33,17 @@ mustfail () {
        if ! fgrep "$wantmsg" $tmp/mustfail.txt >/dev/null; then
                fail "error message not found"
        fi
+       reporefs >$tmp/show-refs.post-push
+       diff $tmp/show-refs.{pre,post}-push
+}
+
+mustsucceed () {
+       reporefs >$tmp/show-refs.pre-push
+       git push origin "$@"
+       reporefs >$tmp/show-refs.post-push
+       if diff $tmp/show-refs.{pre,post}-push >$tmp/show-refs.diff; then
+               fail "no refs updated"
+       fi
 }
 
 prep () {
@@ -77,7 +97,7 @@ cp $tmp/dm.gpg $tmp/dd.gpg
 mustfail 'key not found in keyrings' $push_spec
 
 prep unstable sid
-git push origin $push_spec # succeeds
+mustsucceed $push_spec # succeeds
 mktag
 mustfail 'not replacing previously-pushed version' $push_spec
 
@@ -103,6 +123,6 @@ prep_dm_mangle 'y/0-9/5-90-4/ if m/^fingerprint:/i'
 mustfail "not in permissions list although in keyring" $push_spec
 
 prep_dm_mangle ''
-git push origin $push_spec # succeeds
+mustsucceed $push_spec # succeeds
 
 echo ok.