X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Ftrustingpolicy-replay;h=2736a523de98d05f0b24065af3857bb30bc6c4b5;hb=c315665ee5ff99ad78b4621abfd6be0d73b4e0c9;hp=4fc3c175bb5383faa81ad29836d13fb757ae2695;hpb=b1dad15471a23b4a60a69de34dd4772da8663262;p=dgit.git

diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay
index 4fc3c175..2736a523 100755
--- a/tests/tests/trustingpolicy-replay
+++ b/tests/tests/trustingpolicy-replay
@@ -26,7 +26,7 @@ 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
@@ -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 E:'policy-hook.*No such file or directory' \
 	t-dgit push $delib
 
 	t-policy dgit-repos-policy-trusting
@@ -58,7 +58,7 @@ prepare-replay () {
 attempt-replay () {
 	local mpat=$1
 	git show debian/$replayv | grep -e $delib
-	t-expect-fail "$mpat" \
+	t-expect-push-fail "$mpat" \
 	git push "$remote" \
 		debian/$replayv \
 		+debian/$replayv~0:refs/dgit/sid