t6026-merge-attr: ensure that the merge driver was called

andreas-schwab · gitster · commit c1e0dc59bddc · 2016-11-10T11:20:56.000-08:00
Explicitly check for the existence of the pid file to test that the
merge driver was actually called.

Signed-off-by: Andreas Schwab &lt;schwab@suse.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
@@ -193,7 +193,8 @@ test_expect_success 'custom merge does not lock index' '
 		"* merge=ours" "text merge=sleep-one-second" &&
 	test_config merge.ours.driver true &&
 	test_config merge.sleep-one-second.driver ./sleep-one-second.sh &&
-	git merge master
+	git merge master &&
+	test -f sleep.pid
 '
 
 test_done

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,8 @@ test_expect_success 'custom merge does not lock index' '`
`193`	`193`	`"* merge=ours" "text merge=sleep-one-second" &&`
`194`	`194`	`test_config merge.ours.driver true &&`
`195`	`195`	`test_config merge.sleep-one-second.driver ./sleep-one-second.sh &&`
`196`		`- git merge master`
	`196`	`+ git merge master &&`
	`197`	`+ test -f sleep.pid`
`197`	`198`	`'`
`198`	`199`
`199`	`200`	`test_done`