X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdebpolicy-newreject;h=c238a5aa90a05f70182c150340c213d29ea8bcd2;hp=40f5db5dfd0d409ec4f9cd8dd6a5a258a4fefcc1;hb=d45a224aee98c04bf3038dcda9b258ba5abf0d70;hpb=2212a3b83e5e983a6d2b65a491287fa3d6bdbbbc

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 40f5db5d..c238a5aa 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-prep-mergechangelogs
 
 echo FORBIDDEN >debian/some-file
 git add debian/some-file
@@ -53,6 +54,8 @@ t-expect-push-fail E:"tag debian/${vanished//./\\.} referred to this object.*all
 t-dgit push --new
 t-git-dir-check enoent
 
+vanished=$v
+
 t-dgit push --new --deliberately-include-questionable-history
 t-git-dir-check secret
 
@@ -73,7 +76,8 @@ 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-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
@@ -83,5 +87,34 @@ 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
+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 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 ok.