X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdebpolicy-newreject;h=ed4a1446d2a930cf0e95e6c0a13efd2d5b6347c0;hp=c1192d1693e8ee1f1eec2fc24c344151a4d3e452;hb=eccc1d4a664ce41b3319f62e4fe2560268a1fc4a;hpb=6b8c969adabf3b74d9deb836e5377a3e01c2a57b

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index c1192d16..ed4a1446 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -10,6 +10,7 @@ t-prep-newpackage example 1.0
 cd $p
 revision=1
 git tag start
+t-dgit setup-mergechangelogs
 
 echo FORBIDDEN >debian/some-file
 git add debian/some-file
@@ -17,9 +18,14 @@ 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
+'
 
 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
 
@@ -45,10 +51,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 test-dummy/${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
 
@@ -66,22 +74,48 @@ 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-fail "Package is in NEW and has not been accepted or rejected yet" \
-t-dgit --deliberately-TEST-not-fast-forward-dgit-only 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-fail "Not a valid object name" \
+cd $dgitrepo
+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 test forbidden objects not present
-echo xxx want to check expect fail did not push
-echo xxx want to check replay prevention insufficient proofs in tag
-echo xxx want to check replay prevention removed tags file
+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
+
+git checkout -b stoats test-dummy/$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 ok.