From: Jeff King <peff@peff.net>
Date: Fri, 20 Sep 2013 10:25:00 +0000 (-0400)
Subject: t5541: mark passing c-a-s test as success
X-Git-Tag: v1.8.5-rc0~84^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42aa29ee12bbc769567c4c8ed694566511ef2e39;p=thirdparty%2Fgit.git

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

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
index dab405d574..54dbbfe5ce 100644
--- 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")