X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fdrs-push-rejects;h=6098da79a0cd0da4a685dc1210d0fdeed5af5116;hb=cdd43051c739c4157175ede1bdd1a54c9d2a7e8d;hp=10c10bf60b402c70a0aad68686639ae8161ecbac;hpb=fd0f9361c6833ff1266ff2590797f170af0be090;p=dgit.git

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 10c10bf6..6098da79 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -26,9 +26,10 @@ mustfail () {
 	fi
 }
 
-mktag1 () {
+prep () {
 	local suite=$1
 	local csuite=$2
+	cp $tmp/masters/* $tmp/.
 	tag_signer='-u Senatus'
 	tag_message="$p release $version for $suite ($csuite) [dgit]"
 	tag_name=debian/3-2_dummy1
@@ -36,31 +37,36 @@ mktag1 () {
 	push_spec2="refs/tags/$tag_name"
 	push_spec="$push_spec1 $push_spec2"
 }
-mktag2 () {
+mktag () {
 	git tag -f $tag_signer -m "$tag_message" $tag_name "$@"
 }
 
+mkdir $tmp/masters
+cp $tmp/d[dm].* $tmp/masters
 
 version=3-2_dummy1
 
-mktag1 unstable sid
+prep unstable sid
 tag_signer='-a'
-mktag2
+mktag
 mustfail 'missing signature' $push_spec
 
-mktag1 unstable sid
+prep unstable sid
 tag_message='something'
-mktag2
+mktag
 mustfail 'tag message not in expected format' $push_spec
 
-mktag1 unstable sid
-mktag2
+prep unstable sid
+mktag
 
 mustfail 'sid != sponge' HEAD:refs/dgit/sponge $push_spec2
 
+# fixme test --sig-policy-url string
+# fixme cannot test   reject "signature is not of type 00!";
+
 git push origin $push_spec
 
-mktag2
+mktag
 
 mustfail 'not replacing previously-pushed version' $push_spec