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

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 765c4d26..c238a5aa 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -54,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
 
@@ -99,4 +101,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 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.