Test suite: Use t-expect-push-fail everywhere

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 82762bb4a2ec7aee479046e9a9b5c4d6fb4fd3a1..09c1a160411c282da544811ab8e55a3015629bf6 100755 (executable)
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -19,7 +19,7 @@ bad=`git rev-parse HEAD:debian/some-file`
 t-policy-admin taint --global "$bad" "forbidden for testing"
 
 t-dgit build
-t-expect-fail 'forbidden for testing' \
+t-expect-push-fail 'forbidden for testing' \
 t-dgit push --new
 t-git-dir-check enoent
 
@@ -45,7 +45,7 @@ t-git-dir-check enoent
 t-commit 'should require --deliberately...questionable'
 t-dgit build
 
-t-expect-fail E:"tag debian/${vanished//./\\.} referred to this object.*all previously pushed versions were found to have been removed" \
+t-expect-push-fail E:"tag debian/${vanished//./\\.} referred to this object.*all previously pushed versions were found to have been removed" \
 t-dgit push --new
 t-git-dir-check enoent
 
@@ -66,20 +66,20 @@ git reset --hard start
 t-commit 'should require --deliberately..not-ff'
 t-dgit build
 
-t-expect-fail "HEAD is not a descendant of the archive's version" \
+t-expect-push-fail "HEAD is not a descendant of the archive's version" \
 t-dgit push
 
-t-expect-fail "Package is in NEW and has not been accepted or rejected yet" \
+t-expect-push-fail "Package is in NEW and has not been accepted or rejected yet" \
 t-dgit --deliberately-TEST-dgit-only-not-fast-forward push
 
 t-dgit --deliberately-not-fast-forward push
 
 cd $tmp/git/$p.git
-t-expect-fail "Not a valid object name" \
+t-expect-push-fail "Not a valid object name" \
 git cat-file -p $oldobj
 cd $tmp/$p
 
 echo xxx up to here
 echo xxx want to test database lock retry thing on push-and-taint
 echo xxx want to test forbidden objects not present
-echo xxx want to check expect fail did not push "(everywhere)"
+echo xxx want to t-expect-push-fail leaves HEAD object not dest repo

diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index 419ffd3e818c0f08f4f53e81d6df8c5414229821..d0f3f35a40d9927af72afb01fd3aa5c729836046 100755 (executable)
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -8,7 +8,7 @@ cd $p
 t-refs-same-start
 t-ref-head
 
-t-expect-fail 'package appears to be new in this suite' \
+t-expect-push-fail 'package appears to be new in this suite' \
 t-dgit push
 
 t-dgit build

diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay
index 79674fefda2fce29ce48129dab5027bb407ae22b..e0bf334beac8e4b75af47293db0f1e5f215986ad 100755 (executable)
--- 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
@@ -47,7 +47,7 @@ prepare-replay () {
 
        t-commit "request with $delib that we will replay"
        t-dgit build
-       t-expect-fail E:'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