From 42aa29ee12bbc769567c4c8ed694566511ef2e39 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 20 Sep 2013 06:25:00 -0400 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- t/lib-httpd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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") -- 2.11.4.GIT