t5541: mark passing c-a-s test as success

peff · gitster · commit 42aa29ee12bb · 2013-09-20T11:18:09.000-07:00
Commit 05c1eb1 (push: teach --force-with-lease to smart-http transport) fixed the compare-and-swap test in t5541. It tried to mark the test as passing by teaching the test helper function to expect an extra "success or failure" parameter, but forgot to actually use the parameter in the helper. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
@@ -169,7 +169,7 @@ test_http_push_nonff () {
 		test_i18ngrep "Updates were rejected because" output
 	'
 
-	test_expect_failure 'force with lease aka cas' '
+	test_expect_${EXPECT_CAS_RESULT} 'force with lease aka cas' '
 		HEAD=$(	cd "$REMOTE_REPO" && git rev-parse --verify HEAD ) &&
 		test_when_finished '\''
 			(cd "$REMOTE_REPO" && git update-ref HEAD "$HEAD")

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ test_http_push_nonff () {`
`169`	`169`	`test_i18ngrep "Updates were rejected because" output`
`170`	`170`	`'`
`171`	`171`
`172`		`- test_expect_failure 'force with lease aka cas' '`
	`172`	`+ test_expect_${EXPECT_CAS_RESULT} 'force with lease aka cas' '`
`173`	`173`	`HEAD=$( cd "$REMOTE_REPO" && git rev-parse --verify HEAD ) &&`
`174`	`174`	`test_when_finished '\''`
`175`	`175`	`(cd "$REMOTE_REPO" && git update-ref HEAD "$HEAD")`