Browse Source

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>
maint
Jeff King 11 years ago committed by Junio C Hamano
parent
commit
42aa29ee12
  1. 2
      t/lib-httpd.sh

2
t/lib-httpd.sh

@ -169,7 +169,7 @@ test_http_push_nonff () {
test_i18ngrep "Updates were rejected because" output 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 ) && HEAD=$( cd "$REMOTE_REPO" && git rev-parse --verify HEAD ) &&
test_when_finished '\'' test_when_finished '\''
(cd "$REMOTE_REPO" && git update-ref HEAD "$HEAD") (cd "$REMOTE_REPO" && git update-ref HEAD "$HEAD")

Loading…
Cancel
Save