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

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index da40631a..2e1bf88a 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -2,24 +2,15 @@
 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
+t-prep-mergechangelogs
 
 echo FORBIDDEN >debian/some-file
 git add debian/some-file
@@ -28,8 +19,12 @@ 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-fail 'forbidden for testing' \
+t-expect-push-fail 'forbidden for testing' \
 t-dgit push --new
 t-git-dir-check enoent
 
@@ -55,10 +50,12 @@ 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-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
 
+vanished=$v
+
 t-dgit push --new --deliberately-include-questionable-history
 t-git-dir-check secret
 
@@ -71,18 +68,53 @@ 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-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
+
+t-commit 'Still not accepted, will override taint'
+t-dgit build
+t-expect-push-fail \
+    "Package is in NEW and has not been accepted or rejected yet" \
+t-dgit push
+
+t-dgit push --deliberately-include-questionable-history
+
+t-archive-process-incoming sid
+
+t-commit 'Check taint is no longer there'
+t-dgit build
 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
+git checkout -b stoats debian/$vanished
+t-commit 'Simulate accidentally building on rejected version'
+t-dgit build
+t-expect-push-fail "HEAD is not a descendant of the archive's version" \
+t-dgit push
+
+: "check that uploader can't force it now"
+t-expect-push-fail "not fast forward on dgit branch" \
+t-dgit --deliberately-not-fast-forward push
+
+t-dgit pull
+t-dgit build
+t-expect-push-fail \
+    'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
+t-dgit 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)'