summaryrefslogtreecommitdiff
path: root/tests/tests/drs-push-rejects
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-19 01:34:55 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-25 20:12:52 +0100
commitff53225eafcc9e53998f9f49085a366f3f98fc9c (patch)
treee1b7a52878fb18d59ad9b8728477402856a8eb2c /tests/tests/drs-push-rejects
parentf161f45247f812f366a76e039035255450d4e522 (diff)
Split brain: dgit-repos-server: Permit pushing maintainer tag too
Split brain is going to need the maintainer tag on the dgit server. Allow clients to push the _both_ the DEP-14 and new dgit archive/ tag. In this case dgit-repos-server can largely ignore the DEP-14 tag. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/drs-push-rejects')
-rwxr-xr-xtests/tests/drs-push-rejects3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index e4cf944..6f2797a 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -102,7 +102,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