X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Ftrustingpolicy-replay;h=2a1012b69ef68366cd62dd910776e9604c55d3d3;hp=b779f64b129b1c604559f42c92133586693652b3;hb=8381243a5f0a311bdf8ef2c8d695d7993de76a9d;hpb=c17699d17f17f6ea105b7440ff95fa39eebb54a6

diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay
index b779f64b..2a1012b6 100755
--- a/tests/tests/trustingpolicy-replay
+++ b/tests/tests/trustingpolicy-replay
@@ -4,6 +4,10 @@ set -e
 
 t-tstunt-parsechangelog
 
+t-dependencies dput-ng
+
+t-git-config dgit.default.dep14tag no
+
 t-dsd
 t-policy dgit-repos-policy-trusting
 t-prep-newpackage example 1.0
@@ -15,12 +19,13 @@ git tag start
 t-dgit build
 t-dgit push --new
 
+t-rm-dput-dropping
+
 t-commit 'Prep v1.1 which will be rewound'
 t-dgit build
 t-dgit push
 
-t-rm-dput-dropping
-git checkout test-dummy/1.0
+git checkout $tagpfx/1.0
 t-dgit build
 t-dgit push --deliberately-fresh-repo
 
@@ -28,8 +33,8 @@ remote="`git config dgit-distro.test-dummy.git-url`/$p.git"
 
 t-expect-push-fail 'Replay of previously-rewound upload' \
 git push "$remote" \
-	test-dummy/1.1 \
-	test-dummy/1.1~0:refs/dgit/sid
+	$tagpfx/1.1 \
+	$tagpfx/1.1~0:refs/dgit/sid
 
 git checkout master
 
@@ -47,7 +52,7 @@ prepare-replay () {
 
 	t-commit "request with $delib that we will replay"
 	t-dgit build
-	t-expect-push-fail E:'policy-hook.*No such file or directory' \
+	t-expect-push-fail 'system: No such file or directory' \
 	t-dgit push $delib
 
 	t-policy dgit-repos-policy-trusting
@@ -57,11 +62,11 @@ prepare-replay () {
 
 attempt-replay () {
 	local mpat=$1
-	git show test-dummy/$replayv | grep -e $delib
+	git show $tagpfx/$replayv | grep -e $delib
 	t-expect-push-fail "$mpat" \
 	git push "$remote" \
-		test-dummy/$replayv \
-		+test-dummy/$replayv~0:refs/dgit/sid
+		$tagpfx/$replayv \
+		+$tagpfx/$replayv~0:refs/dgit/sid
 }
 
 prepare-replay --deliberately-fresh-repo
@@ -77,7 +82,7 @@ t-commit 'later version to stop not fast forward rewinding'
 t-dgit build
 t-dgit push
 
-attempt-replay "does not declare previously tags/test-dummy/$v"
+attempt-replay "does not declare previously tags/$tagpfx/$v"
 
 
-echo ok.
+t-ok