Fix httpd tests that broke when non-ff push advice changed

ctiwald · gitster · commit 0aff719f4897 · 2012-04-12T13:48:52.000-07:00
Signed-off-by: Christopher Tiwald &lt;christiwald@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,6 @@ test_http_push_nonff() {`
`160`	`160`	`'`
`161`	`161`
`162`	`162`	`test_expect_success 'non-fast-forward push shows help message' '`
`163`		`- test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" output`
	`163`	`+ test_i18ngrep "Updates were rejected because" output`
`164`	`164`	`'`
`165`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he`
`167`	`167`	`'`
`168`	`168`
`169`	`169`	`test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '`
`170`		`- test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" \`
	`170`	`+ test_i18ngrep "Updates were rejected because" \`
`171`	`171`	`output`
`172`	`172`	`'`
`173`	`173`