X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdebpolicy-newreject;h=82762bb4a2ec7aee479046e9a9b5c4d6fb4fd3a1;hp=b36ff3bfd7470ba039e122dd0ab56af739270472;hb=609f108165197b1d7a55a4908a321bad40a86442;hpb=f040d41cc7411e08709a5e0ba97aa985589b4790

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index b36ff3bf..82762bb4 100755
--- 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
 
@@ -71,6 +61,7 @@ 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
@@ -79,10 +70,16 @@ 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
+
+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
-echo xxx want to check replay prevention '(delete tag)'
+echo xxx want to check expect fail did not push "(everywhere)"