Re: [PATCH v2] t6026-merge-attr: don't fail if sleep exits early
From: Junio C Hamano <hidden>
Date: 2016-11-10 19:21:03
Andreas Schwab [off-list ref] writes:
Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end
of test case") added a kill command to clean up after the test, but this
can fail if the sleep command exits before the cleanup is executed.
Ignore the error from the kill command.
Explicitly check for the existence of the pid file to test that the merge
driver was actually called.
Signed-off-by: Andreas Schwab <redacted>
---OK. sleep.pid is a reasonable easy-to-access side effect we can observe to make sure that the sleep-one-second merge driver was indeed invoked, which was missing from the earlier round. Thanks, will apply.
quoted hunk
t/t6026-merge-attr.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 7a6e33e673..03d13d00b5 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh@@ -187,13 +187,14 @@ test_expect_success 'custom merge does not lock index' ' sleep 1 & echo $! >sleep.pid EOF - test_when_finished "kill \$(cat sleep.pid)" && + test_when_finished "kill \$(cat sleep.pid) || :" && test_write_lines >.gitattributes \ "* 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-- 2.10.2