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

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 3ce1447a..e4cf944f 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -5,7 +5,7 @@ set -e
 t-drs
 t-git-none
 
-p=pari-extra
+t-select-package pari-extra
 t-worktree drs
 
 cd $p
@@ -31,12 +31,13 @@ prep () {
 	cp $tmp/masters/* $tmp/.
 	tag_signer='-u Senatus'
 	tag_message="$p release $version for $suite ($csuite) [dgit]"
-	tag_name=test-dummy/$version
+	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 "$@"
 }
 
@@ -101,7 +102,7 @@ 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/test-dummy/wombat
+mustfail 'pushing multiple tags' $push_spec HEAD:refs/tags/$tagpfx/wombat
 
 prep unstable sid
 mktag
@@ -128,11 +129,11 @@ mktag HEAD~:
 mustfail 'tag refers to wrong kind of object' $push_spec
 
 prep unstable sid
-tag_name=test-dummy/wombat
+tag_name=$tagpfx/wombat
 mktag
-#git update-ref test-dummy/$version test-dummy/wombat
+#git update-ref $tagpfx/$version $tagpfx/wombat
 mustfail 'tag name in tag is wrong' \
-	refs/tags/test-dummy/wombat:refs/tags/test-dummy/$version $push_spec1
+	refs/tags/$tagpfx/wombat:refs/tags/$tagpfx/$version $push_spec1
 
 prep unstable sid
 mktag