changelog: start 7.1~

[dgit.git] / tests / tests / trustingpolicy-replay

diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay
index 517f98a08014759fd13b22bb095472e59087cfd1..2a1012b69ef68366cd62dd910776e9604c55d3d3 100755 (executable)
--- 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
 
@@ -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