dgit-repos-server: some better error msgs, more tests

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

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index eab44a5188670d8bf230cd790f5f50ca50f482df..aa092bc81ee7eb73f05cc22a87af78f762d066a6 100755 (executable)
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -10,20 +10,40 @@ 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[*]}"
        set -e
        case $ps in
-       "0 0")  fail "push unexpectedly succeeded: $*" ;;
+       "0 0")  fail "push unexpectedly succeeded (instead of: $wantmsg)" ;;
        *" 0")  ;;
        *)      fail "tee failed"  ;;
        esac
        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 () {
@@ -74,10 +94,20 @@ mustfail 'pushing multiple tags' $push_spec HEAD:refs/tags/debian/wombat
 prep unstable sid
 mktag
 cp $tmp/dm.gpg $tmp/dd.gpg
-mustfail 'key not found in keyrings'
+mustfail 'key not found in keyrings' $push_spec
+
+prep unstable sid
+mktag HEAD~
+mustfail 'tag refers to wrong commit' $push_spec
 
 prep unstable sid
-git push origin $push_spec # succeeds
+mktag HEAD~:
+mustfail 'tag refers to wrong kind of object' $push_spec
+
+prep unstable sid
+mktag
+mustsucceed $push_spec # succeeds
+
 mktag
 mustfail 'not replacing previously-pushed version' $push_spec
 
@@ -93,6 +123,10 @@ prep_dm_mangle () {
 git checkout v2
 version=3-2_dummy2
 
+prep_dm_mangle ''
+perl -i.bak -ne 'print if 1..s/(pari-extra).*\n/$1/' $tmp/dm.txt
+mustfail '' $push_spec # malformed (truncated) dm.txt; don't care about msg
+
 prep_dm_mangle 's/allow:/asponge:/i'
 mustfail 'missing Allow section in permission' $push_spec
 
@@ -103,6 +137,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.