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 00972e747fe8b0483bbd8ea6927e045e891c9387..82762bb4a2ec7aee479046e9a9b5c4d6fb4fd3a1 100755 (executable)
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -2,20 +2,14 @@
 set -e
 . tests/lib
 
+t-tstunt-parsechangelog
+
 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
 git add debian/some-file
@@ -29,7 +23,7 @@ t-expect-fail 'forbidden for testing' \
 t-dgit push --new
 t-git-dir-check enoent
 
-git reset --hard HEAD~
+git reset --hard start
 t-commit 'will vanish from NEW'
 vanished=$v
 t-dgit build
@@ -51,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
 
@@ -67,4 +61,25 @@ t-git-dir-time-passes
 t-policy-periodic
 t-git-dir-check secret
 
+oldobj=`git rev-parse HEAD`
+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-dgit push
+
+t-expect-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" \
+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)"