Work around #793471 (madness with $SIG{__WARN__} and Perl's system builtin): move...

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

diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay
index 4fc3c175bb5383faa81ad29836d13fb757ae2695..517f98a08014759fd13b22bb095472e59087cfd1 100755 (executable)
--- a/tests/tests/trustingpolicy-replay
+++ b/tests/tests/trustingpolicy-replay
@@ -20,16 +20,16 @@ t-dgit build
 t-dgit push
 
 t-rm-dput-dropping
-git checkout debian/1.0
+git checkout test-dummy/1.0
 t-dgit build
 t-dgit push --deliberately-fresh-repo
 
 remote="`git config dgit-distro.test-dummy.git-url`/$p.git"
 
-t-expect-fail 'Replay of previously-rewound upload' \
+t-expect-push-fail 'Replay of previously-rewound upload' \
 git push "$remote" \
-       debian/1.1 \
-       debian/1.1~0:refs/dgit/sid
+       test-dummy/1.1 \
+       test-dummy/1.1~0:refs/dgit/sid
 
 git checkout master
 
@@ -43,11 +43,11 @@ prepare-replay () {
        # record the tag, which prevents the replays.  We are simulating
        # abortive pushes (since we do want to avoid a situation where
        # dangerous old signed tags can exist).
-       t-policy false
+       t-policy-nonexist
 
        t-commit "request with $delib that we will replay"
        t-dgit build
-       t-expect-fail "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,17 +57,17 @@ prepare-replay () {
 
 attempt-replay () {
        local mpat=$1
-       git show debian/$replayv | grep -e $delib
-       t-expect-fail "$mpat" \
+       git show test-dummy/$replayv | grep -e $delib
+       t-expect-push-fail "$mpat" \
        git push "$remote" \
-               debian/$replayv \
-               +debian/$replayv~0:refs/dgit/sid
+               test-dummy/$replayv \
+               +test-dummy/$replayv~0:refs/dgit/sid
 }
 
 prepare-replay --deliberately-fresh-repo
 
 # simulate some other thing that we shouldn't delete
-git push $tmp/git/$p.git +master:refs/heads/for-testing
+git push $dgitrepo +master:refs/heads/for-testing
 
 attempt-replay 'does not declare previously heads/for-testing'
 
@@ -77,7 +77,7 @@ t-commit 'later version to stop not fast forward rewinding'
 t-dgit build
 t-dgit push
 
-attempt-replay "does not declare previously tags/debian/$v"
+attempt-replay "does not declare previously tags/test-dummy/$v"
 
 
 echo ok.