t5541: mark passing c-a-s test as success
authorJeff King <peff@peff.net>
Fri, 20 Sep 2013 10:25:00 +0000 (06:25 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2013 18:18:09 +0000 (11:18 -0700)
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>
t/lib-httpd.sh
index dab405d57479fe95dcb71b16a7a059410d2ae005..54dbbfe5ceeb9bf91cdad3393c2fdfe95c06fd18 100644 (file)
@@ -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")