X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdebpolicy-newreject;h=af02ac147d29b26405bed855ec8d31293cd8b5fd;hp=765c4d26b4407d747122a258430424f12bd68da8;hb=HEAD;hpb=6206349cffcc47da7d927aeec058e579654d2075

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 765c4d26..af02ac14 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -10,7 +10,7 @@ t-prep-newpackage example 1.0
 cd $p
 revision=1
 git tag start
-t-prep-mergechangelogs
+t-dgit setup-mergechangelogs
 
 echo FORBIDDEN >debian/some-file
 git add debian/some-file
@@ -18,6 +18,7 @@ t-commit 'Commit a forbidden thing'
 
 bad=`git rev-parse HEAD:debian/some-file`
 t-policy-admin taint --global "$bad" "forbidden for testing"
+t-policy-admin taint --global "$bad" "forbidden for testing - again"
 
 t_expect_push_fail_hook+='
 t-git-objects-not-present "" $bad
@@ -50,11 +51,14 @@ t-git-dir-check enoent
 t-commit 'should require --deliberately...questionable'
 t-dgit build
 
-t-expect-push-fail E:"tag debian/${vanished//./\\.} referred to this object.*all previously pushed versions were found to have been removed" \
+t-expect-push-fail E:"tag $tagpfx/${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
+vanished=$v
+
+t-dgit push --new --deliberately-include-questionable-history \
+	--force-reusing-version
 t-git-dir-check secret
 
 t-policy-periodic
@@ -78,9 +82,9 @@ 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
+t-dgit --deliberately-not-fast-forward --force-reusing-version push
 
-cd $tmp/git/$p.git
+cd $dgitrepo
 t-expect-push-fail "Not a valid object name" \
 git cat-file -p $oldobj
 cd $tmp/$p
@@ -91,7 +95,8 @@ 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-dgit push --deliberately-include-questionable-history \
+	--force-reusing-version
 
 t-archive-process-incoming sid
 
@@ -99,4 +104,20 @@ t-commit 'Check taint is no longer there'
 t-dgit build
 t-dgit push
 
-echo xxx want to test database lock retry thing on push-and-taint
+git checkout -b stoats $tagpfx/$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 --force-reusing-version push
+
+t-ok