X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdebpolicy-newreject;h=10af31fcb81f0ab59293d8be024baca7a1c6f776;hp=7cf2a3a47357004ae2a6d22a66b25e2a94e26770;hb=26b8f62b600642b1a469a305c3ed8bc0a165a255;hpb=c4e6f46a26de88f746cbbda6af94821242d71bf2

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 7cf2a3a4..10af31fc 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -2,21 +2,87 @@
 set -e
 . tests/lib
 
+t-tstunt-parsechangelog
+
 t-debpolicy
 t-prep-newpackage example 1.0
 
 cd $p
-
+revision=1
+git tag start
 
 echo FORBIDDEN >debian/some-file
 git add debian/some-file
-git commit -m 'Commit a forbidden thing'
+t-commit 'Commit a forbidden thing'
 
 bad=`git rev-parse HEAD:debian/some-file`
 t-policy-admin taint --global "$bad" "forbidden for testing"
 
+t_expect_push_fail_hook+='
+t-git-objects-not-present "" $bad
+'
+
+t-dgit build
+t-expect-push-fail 'forbidden for testing' \
+t-dgit push --new
+t-git-dir-check enoent
+
+git reset --hard start
+t-commit 'will vanish from NEW'
+vanished=$v
+t-dgit build
+t-dgit push --new
+t-git-dir-check secret
+
+t-policy-periodic
+t-git-dir-check secret
+
+# pretend it vanished from new:
+rm $tmp/incoming/*
+t-archive-none example
+
+t-git-dir-time-passes
+
+t-policy-periodic
+t-git-dir-check enoent
+
+t-commit 'should require --deliberately...questionable'
 t-dgit build
-t-expect-fail 'forbidden for testing' \
+
+t-expect-push-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
+
+t-dgit push --new --deliberately-include-questionable-history
+t-git-dir-check secret
+
+t-policy-periodic
+t-git-dir-check secret
+
+t-archive-process-incoming new
+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-push-fail "HEAD is not a descendant of the archive's version" \
+t-dgit push
+
+t-expect-push-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-push-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 t-expect-push-fail leaves HEAD object not dest repo