Test suite: Test dgit-repos-policy-debian database retry

[dgit.git] / tests / tests / debpolicy-newreject

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 0400c0835c6a16da80b20035963366cd21383c5b..c238a5aa90a05f70182c150340c213d29ea8bcd2 100755 (executable)
--- 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
 
@@ -98,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.