dgit-maint-gbp(7): Mention --overwrite

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

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index e4cf944f6f769fc5d8f0fdf4e036b3447d28b56d..f87cbdcbefc5f873b32c74b3b36e830534c30dae 100755 (executable)
--- 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 () {