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

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 00972e74..da40631a 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -2,6 +2,8 @@
 set -e
 . tests/lib
 
+t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
+
 t-debpolicy
 t-prep-newpackage example 1.0
 
@@ -17,6 +19,8 @@ t-commit () {
 	revision=$(( $revision + 1 ))
 }
 
+git tag start
+
 echo FORBIDDEN >debian/some-file
 git add debian/some-file
 t-commit 'Commit a forbidden thing'
@@ -29,7 +33,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
@@ -67,4 +71,18 @@ t-git-dir-time-passes
 t-policy-periodic
 t-git-dir-check secret
 
+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-not-fast-forward-dgit-only push
+
 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)'