* [PATCH] t5541: mark passing c-a-s test as success
@ 2013-09-20 10:25 Jeff King
2013-09-20 18:18 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Jeff King @ 2013-09-20 10:25 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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>
---
On top of jc/push-cas.
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 dab405d..54dbbfe 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")
--
1.8.4.37.g67196dd
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-20 18:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-20 10:25 [PATCH] t5541: mark passing c-a-s test as success Jeff King
2013-09-20 18:18 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).