tainted-objects (cleanup): Move t-expect-push-fail-tainted to lib

And rename it.

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

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/lib b/tests/lib
index 2f8d09c..cb061a7 100644
--- a/tests/lib
+++ b/tests/lib
@@ -180,6 +180,16 @@ t-expect-push-fail-retriably () {
 		$tmp/t.push-output
 }
 
+t-expect-push-fail-tainted () {
+	# t-expect-push-fail-local-and-remote $mlocal $mremote $push_args...
+	# Messages are implicitly prefixed with 'E:^'
+	# to avoid spotting them in protocol debug output etc.
+	local ml="$1"; local mr="$2"; shift; shift
+
+	t-expect-push-fail-retriably E:"^$ml" "$@"
+	t-expect-push-fail E:"^$mr" "$@" --force-push-tainted
+}
+
 t-git-objects-not-present () {
 	# t-git-objects-not-present GITDIR|'' OBJID [...]
 	# specifying '' means the repo for package $p