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

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 2a2e8f3a..82762bb4 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -2,15 +2,18 @@
 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"
@@ -20,8 +23,9 @@ t-expect-fail 'forbidden for testing' \
 t-dgit push --new
 t-git-dir-check enoent
 
-git reset --hard HEAD~
-git commit --allow-empty -m 'will vanish from NEW'
+git reset --hard start
+t-commit 'will vanish from NEW'
+vanished=$v
 t-dgit build
 t-dgit push --new
 t-git-dir-check secret
@@ -38,14 +42,44 @@ t-git-dir-time-passes
 t-policy-periodic
 t-git-dir-check enoent
 
-git commit --allow-empty -m 'should require --deliberately...questionable'
+t-commit 'should require --deliberately...questionable'
 t-dgit build
 
-t-expect-fail 'tag debian/1.0 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
 
 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-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)"