test suite: Add --force-reusing-version to many tests

This is going to be needed in a moment.  Unknown --force options are
harmless and just generate warnings, so we do this in advance.

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

5 files changed, 11 insertions, 8 deletions

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 1fa6751..af02ac1 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -57,7 +57,8 @@ t-git-dir-check enoent
 
 vanished=$v
 
-t-dgit push --new --deliberately-include-questionable-history
+t-dgit push --new --deliberately-include-questionable-history \
+	--force-reusing-version
 t-git-dir-check secret
 
 t-policy-periodic
@@ -81,7 +82,7 @@ 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
+t-dgit --deliberately-not-fast-forward --force-reusing-version push
 
 cd $dgitrepo
 t-expect-push-fail "Not a valid object name" \
@@ -94,7 +95,8 @@ 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-dgit push --deliberately-include-questionable-history \
+	--force-reusing-version
 
 t-archive-process-incoming sid
 
@@ -116,6 +118,6 @@ t-dgit pull
 t-dgit build
 t-expect-push-fail \
     'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
-t-dgit push
+t-dgit --force-reusing-version push
 
 t-ok
diff --git a/tests/tests/debpolicy-taintrm b/tests/tests/debpolicy-taintrm
index 8655fb5..a9e54da 100755
--- a/tests/tests/debpolicy-taintrm
+++ b/tests/tests/debpolicy-taintrm
@@ -35,7 +35,8 @@ t-expect-push-fail \
  'all previously pushed versions were found to have been removed from NEW' \
 t-dgit push-source --new
 
-t-dgit push-source --new --deliberately-include-questionable-history
+t-dgit push-source --new --deliberately-include-questionable-history \
+	--force-reusing-version
 
 t-archive-process-incoming new
 
diff --git a/tests/tests/push-newrepeat b/tests/tests/push-newrepeat
index 87fcb35..048dfd2 100755
--- a/tests/tests/push-newrepeat
+++ b/tests/tests/push-newrepeat
@@ -16,6 +16,6 @@ t-expect-fail E:'Push failed, while updating the remote git repository' \
 t-dgit -cdgit-distro.test-dummy.git-url=file:///dev/enoent/fail \
        push --new
 
-t-dgit push --new
+t-dgit push --new --force-reusing-version
 
 t-ok
diff --git a/tests/tests/quilt-singlepatch b/tests/tests/quilt-singlepatch
index 320a31c..9c03595 100755
--- a/tests/tests/quilt-singlepatch
+++ b/tests/tests/quilt-singlepatch
@@ -40,6 +40,6 @@ git apply --reverse debian/patches/debian-changes
 git commit -a -m 'go back to plain upstream'
 
 t-dgit -wgf build-source
-t-dgit --damp-run push
+t-dgit --damp-run --force-reusing-version push
 
 t-ok
diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay
index 2a1012b..a2d280d 100755
--- a/tests/tests/trustingpolicy-replay
+++ b/tests/tests/trustingpolicy-replay
@@ -27,7 +27,7 @@ t-dgit push
 
 git checkout $tagpfx/1.0
 t-dgit build
-t-dgit push --deliberately-fresh-repo
+t-dgit push --deliberately-fresh-repo --force-reusing-version
 
 remote="`git config dgit-distro.test-dummy.git-url`/$p.git"