tainted-objects (cleanup): Improve t-expect-push-fail-tainted

Make it take one string, and expect the same message both locally and
when printed by the remote.

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

1 files changed, 6 insertions, 5 deletions

diff --git a/tests/lib b/tests/lib
index cb061a7..7df79d6 100644
--- a/tests/lib
+++ b/tests/lib
@@ -181,13 +181,14 @@ t-expect-push-fail-retriably () {
 }
 
 t-expect-push-fail-tainted () {
-	# t-expect-push-fail-local-and-remote $mlocal $mremote $push_args...
-	# Messages are implicitly prefixed with 'E:^'
+	# t-expect-push-fail-local-and-remote $m $push_args...
+	# Message is implicitly prefixed with 'E:^'
 	# to avoid spotting them in protocol debug output etc.
-	local ml="$1"; local mr="$2"; shift; shift
+	# Same message is expected from the remote.
+	local m="$1"; shift
 
-	t-expect-push-fail-retriably E:"^$ml" "$@"
-	t-expect-push-fail E:"^$mr" "$@" --force-push-tainted
+	t-expect-push-fail-retriably "E:^$m" "$@"
+	t-expect-push-fail "E:^remote: $m" "$@" --force-push-tainted
 }
 
 t-git-objects-not-present () {