X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdrs-push-rejects;h=f87cbdcbefc5f873b32c74b3b36e830534c30dae;hp=13567c3f3a7b771ca235af9589fdb5f8524310aa;hb=fd18e72ae4857dea79a492c7047af611ece9d1d5;hpb=5d8e32854c1d89e337bc606d423634a667f9b0ff

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 13567c3f..f87cbdcb 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -5,20 +5,15 @@ set -e
 t-drs
 t-git-none
 
-p=pari-extra
+t-select-package pari-extra
 t-worktree drs
 
 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 () {
@@ -32,16 +27,20 @@ mustsucceed () {
 
 prep () {
 	local suite=$1
-	local csuite=$2
+	csuite=$2
 	cp $tmp/masters/* $tmp/.
 	tag_signer='-u Senatus'
 	tag_message="$p release $version for $suite ($csuite) [dgit]"
-	tag_name=debian/$version
+	re-prep
+}
+re-prep () {
+	tag_name=$tagpfx/$version
 	push_spec1="HEAD:refs/dgit/$csuite"
 	push_spec2="refs/tags/$tag_name"
 	push_spec="$push_spec1 $push_spec2"
 }
 mktag () {
+	t-git-next-date
 	git tag -f $tag_signer -m "$tag_message" $tag_name "$@"
 }
 
@@ -103,10 +102,11 @@ mustfail 'sid != sponge' HEAD:refs/dgit/sponge $push_spec2
 prep unstable sid
 mktag
 mustfail 'push is missing tag ref update' $push_spec1
-mustfail 'push is missing head ref update' $push_spec2
+mustfail 'push is missing head ref update' +$push_spec2
 mustfail 'pushing unexpected ref' $push_spec HEAD:refs/wombat
 mustfail 'pushing multiple heads' $push_spec HEAD:refs/dgit/wombat
-mustfail 'pushing multiple tags' $push_spec HEAD:refs/tags/debian/wombat
+mustfail E:'pushing multiple tags|pushing too many similar tags' \
+	$push_spec HEAD:refs/tags/$tagpfx/wombat
 
 prep unstable sid
 mktag
@@ -133,22 +133,28 @@ mktag HEAD~:
 mustfail 'tag refers to wrong kind of object' $push_spec
 
 prep unstable sid
-tag_name=debian/wombat
+tag_name=$tagpfx/wombat
 mktag
-#git update-ref debian/$version debian/wombat
+#git update-ref $tagpfx/$version $tagpfx/wombat
 mustfail 'tag name in tag is wrong' \
-	refs/tags/debian/wombat:refs/tags/debian/$version $push_spec1
+	refs/tags/$tagpfx/wombat:refs/tags/$tagpfx/$version $push_spec1
 
 prep unstable sid
 mktag
 mustsucceed $push_spec # succeeds
 
 mktag
-mustfail 'push is missing head ref update' $push_spec
+mustfail 'push is missing head ref update' $push_spec1 +$push_spec2
 
 git commit --allow-empty -m 'Dummy update'
 mktag
-mustfail 'not replacing previously-pushed version' $push_spec
+mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2
+
+t-newtag
+re-prep
+mktag
+mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2
+
 git reset --hard HEAD~
 
 prep_dm_mangle () {