Merge branch 'jc/push-cas'

jrn · jrn · commit 1939ce67ed0d · 2013-09-24T23:22:03.000-07:00
* jc/push-cas:
  t5541: mark passing c-a-s test as success
diff --git 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")

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ test_http_push_nonff () {`
`169`	`169`	`test_i18ngrep "Updates were rejected because" output`
`170`	`170`	`'`
`171`	`171`
`172`		`- test_expect_failure 'force with lease aka cas' '`
	`172`	`+ test_expect_${EXPECT_CAS_RESULT} 'force with lease aka cas' '`
`173`	`173`	`HEAD=$( cd "$REMOTE_REPO" && git rev-parse --verify HEAD ) &&`
`174`	`174`	`test_when_finished '\''`
`175`	`175`	`(cd "$REMOTE_REPO" && git update-ref HEAD "$HEAD")`