X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fdrs-push-rejects;h=f829dc91bbef4372f0b240f2c00be5c063d632ba;hb=86d5b0c549aee56bcc904bd624c09ed5623e0299;hp=e4cf944f6f769fc5d8f0fdf4e036b3447d28b56d;hpb=8eb4d3531c65dc7afa2bbfe56d535faa756da073;p=dgit.git

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index e4cf944f..f829dc91 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -27,10 +27,13 @@ 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]"
+	re-prep
+}
+re-prep () {
 	tag_name=$tagpfx/$version
 	push_spec1="HEAD:refs/dgit/$csuite"
 	push_spec2="refs/tags/$tag_name"
@@ -102,7 +105,8 @@ mustfail 'push is missing tag ref update' $push_spec1
 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/$tagpfx/wombat
+mustfail E:'pushing multiple tags|pushing too many similar tags' \
+	$push_spec HEAD:refs/tags/$tagpfx/wombat
 
 prep unstable sid
 mktag
@@ -145,6 +149,12 @@ 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_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 () {
@@ -181,4 +191,4 @@ mustfail "not in permissions list although in keyring" $push_spec
 prep_dm_mangle ''
 mustsucceed $push_spec # succeeds
 
-echo ok.
+t-ok