tests: drs-push-rejects: some failure cases; generate tags in script

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 438ba78729e1b15eee8c91b0b095d87719a55e57..10c10bf60b402c70a0aad68686639ae8161ecbac 100755 (executable)
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -10,4 +10,58 @@ t-worktree drs
 
 cd $p
 
-git push origin HEAD:refs/dgit/sid refs/tags/debian/3-2_dummy1
+mustfail () {
+       local wantmsg="$1"; shift
+       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")  ;;
+       *)      fail "tee failed"  ;;
+       esac
+       if ! fgrep "$wantmsg" $tmp/mustfail.txt >/dev/null; then
+               fail "error message not found"
+       fi
+}
+
+mktag1 () {
+       local suite=$1
+       local csuite=$2
+       tag_signer='-u Senatus'
+       tag_message="$p release $version for $suite ($csuite) [dgit]"
+       tag_name=debian/3-2_dummy1
+       push_spec1="HEAD:refs/dgit/$csuite"
+       push_spec2="refs/tags/$tag_name"
+       push_spec="$push_spec1 $push_spec2"
+}
+mktag2 () {
+       git tag -f $tag_signer -m "$tag_message" $tag_name "$@"
+}
+
+
+version=3-2_dummy1
+
+mktag1 unstable sid
+tag_signer='-a'
+mktag2
+mustfail 'missing signature' $push_spec
+
+mktag1 unstable sid
+tag_message='something'
+mktag2
+mustfail 'tag message not in expected format' $push_spec
+
+mktag1 unstable sid
+mktag2
+
+mustfail 'sid != sponge' HEAD:refs/dgit/sponge $push_spec2
+
+git push origin $push_spec
+
+mktag2
+
+mustfail 'not replacing previously-pushed version' $push_spec
+
+echo ok.

diff --git a/tests/worktrees/pari-extra_drs.tar b/tests/worktrees/pari-extra_drs.tar
index 0943ba85aef172580b1664cc673cfe1f571fc5ac..e56fc4f10f6e910d6a6af68f8c2eccbcc18f065f 100644 (file)
Binary files a/tests/worktrees/pari-extra_drs.tar and b/tests/worktrees/pari-extra_drs.tar differ