X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdebpolicy-newreject;h=bda869478059f0bc0638552607e558f214921841;hp=da40631a3fa67760fafb3dda337addcae492c99e;hb=c1e9b51c128cde4b5359618c28405981d690127e;hpb=2c1ecb5ed3ca22a8652408c4a1ad060bf2229675

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index da40631a..bda86947 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -2,23 +2,13 @@
 set -e
 . tests/lib
 
-t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
+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
@@ -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)"