Subject: [PATCH] Fix httpd tests that broke when non-ff push advice changed

From: Christopher Tiwald <[email-masked]>
Date: Thu, 12 Apr 2012 13:56:28 -0400

On Thu, Apr 12, 2012 at 08:35:11AM -0700, Junio C Hamano wrote:
> Please do so.  I assume that the test vectors were expecting specific
> error/advice messages that need to be updated?

Looks to be the case. The below fixes the tests on my machine. It might
be worth adding tests to check the specific advice messages, but that's a
different topic and regardless wouldn't belong in the http-push series.

---- >8 ----
Signed-off-by: Christopher Tiwald <[email-masked]>
---
 t/lib-httpd.sh       |    2 +-
 t/t5541-http-push.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index f7dc078..094d490 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -160,6 +160,6 @@ test_http_push_nonff() {
 	'
 
 	test_expect_success 'non-fast-forward push shows help message' '
-		test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" output
+		test_i18ngrep "Updates were rejected because" output
 	'
 }
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index cc6f081..57c3e48 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -167,7 +167,7 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
 '
 
 test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
-	test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" \
+	test_i18ngrep "Updates were rejected because" \
 		output
 '
 
-- 
1.7.10.167.gf245c

--
Christopher Tiwald