Test suite: Make t-expect-fail flexible wrt which grep to run

[dgit.git] / tests / tests / debpolicy-newreject

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index e64ed6ea5c8ea4db514db3ff14eac2a1a9773793..82762bb4a2ec7aee479046e9a9b5c4d6fb4fd3a1 100755 (executable)
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -8,17 +8,7 @@ t-debpolicy
 t-prep-newpackage example 1.0
 
 cd $p
-
 revision=1
-t-commit () {
-       local msg=$1
-       v=1.$revision
-       dch -v$v --distribution unstable "$1"
-       git add debian/changelog
-       debcommit
-       revision=$(( $revision + 1 ))
-}
-
 git tag start
 
 echo FORBIDDEN >debian/some-file
@@ -55,7 +45,7 @@ t-git-dir-check enoent
 t-commit 'should require --deliberately...questionable'
 t-dgit build
 
-t-expect-fail "tag debian/$vanished referred to this object.*all previously pushed versions were found to have been removed" \
+t-expect-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
 
@@ -80,7 +70,7 @@ t-expect-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-dgit --deliberately-TEST-not-fast-forward-dgit-only push
+t-dgit --deliberately-TEST-dgit-only-not-fast-forward push
 
 t-dgit --deliberately-not-fast-forward push
 
@@ -92,6 +82,4 @@ 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
-echo xxx want to check replay prevention insufficient proofs in tag
-echo xxx want to check replay prevention removed tags file
+echo xxx want to check expect fail did not push "(everywhere)"