summaryrefslogtreecommitdiff
path: root/tests/tests/debpolicy-newreject
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-06-10 18:32:44 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-06-10 18:32:44 +0100
commit073ebedd6e45939fe879e1f8a74abf74181bbe40 (patch)
tree620f9c22f82fd238304c21e759e133ab9a95e4e8 /tests/tests/debpolicy-newreject
parentf97a00d63b1d302cb23c5ffb090efea80fd8d42f (diff)
Test suite: Use t-expect-push-fail everywhere
Diffstat (limited to 'tests/tests/debpolicy-newreject')
-rwxr-xr-xtests/tests/debpolicy-newreject12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 82762bb..09c1a16 100755
--- 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