From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Jun 2015 17:45:46 +0000 (+0100)
Subject: Test suite: Test that trying to reintroduce tainted history fails
X-Git-Tag: debian/0.30~87
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=70e9ff4d8096221e391358be6ca680bdfa1af298

Test suite: Test that trying to reintroduce tainted history fails
---

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 765c4d26..2204244a 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,16 @@ 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
+
+t-dgit pull
+t-dgit build
+t-expect-push-fail \
+    'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
+t-dgit push
+
 echo xxx want to test database lock retry thing on push-and-taint