tests: Test that tainted commits are retriable

And test that they still fail if forced.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 8 insertions, 2 deletions

diff --git a/tests/tests/debpolicy-taintrm b/tests/tests/debpolicy-taintrm
index 47fdfd5..56d1edf 100755
--- a/tests/tests/debpolicy-taintrm
+++ b/tests/tests/debpolicy-taintrm
@@ -4,6 +4,12 @@ set -e
 
 t-tstunt-parsechangelog
 
+t-expect-push-fail-local-and-remote () {
+	local m="$1"; shift
+	t-expect-push-fail-retriably "$m" "$@"
+	t-expect-push-fail "$m" "$@" --force-push-tainted
+}
+
 t-debpolicy
 t-prep-newpackage example 1.0
 
@@ -19,7 +25,7 @@ t-dgit push-source --new
 
 t-commit 'edit after first push'
 
-t-expect-push-fail \
+t-expect-push-fail-local-and-remote \
  'Package is in NEW and has not been accepted or rejected yet' \
 t-dgit push-source --new
 
@@ -37,7 +43,7 @@ t-commit 'edit after cut'
 
 : push, needs --deliberately
 
-t-expect-push-fail \
+t-expect-push-fail-local-and-remote \
  'all previously pushed versions were found to have been removed from NEW' \
 t-dgit push-source --new