diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-11 13:56:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-11 13:56:30 -0800 |
| commit | f5a8ad4c5a2c89555b728ccbaad04bf416cc4274 (patch) | |
| tree | 3f38bde5dd0bf9e612131ad94440e10a41cb97d5 /t | |
| parent | 0538b84027a8aba7e8b805e3ec8fceb3990023e5 (diff) | |
| parent | fdf4f6c79b4260e98729ebeb208036765595e9ac (diff) | |
| download | git-f5a8ad4c5a2c89555b728ccbaad04bf416cc4274.tar.gz git-f5a8ad4c5a2c89555b728ccbaad04bf416cc4274.tar.xz | |
Merge branch 'as/merge-attr-sleep'
Fix for a racy false-positive test failure.
* as/merge-attr-sleep:
t6026: clarify the point of "kill $(cat sleep.pid)"
t6026: ensure that long-running script really is
Revert "t6026-merge-attr: don't fail if sleep exits early"
Revert "t6026-merge-attr: ensure that the merge driver was called"
t6026-merge-attr: ensure that the merge driver was called
t6026-merge-attr: don't fail if sleep exits early
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6026-merge-attr.sh | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 7a6e33e67..8f9b48a49 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh @@ -183,16 +183,24 @@ test_expect_success 'up-to-date merge without common ancestor' ' test_expect_success 'custom merge does not lock index' ' git reset --hard anchor && - write_script sleep-one-second.sh <<-\EOF && - sleep 1 & + write_script sleep-an-hour.sh <<-\EOF && + sleep 3600 & echo $! >sleep.pid EOF - test_when_finished "kill \$(cat sleep.pid)" && test_write_lines >.gitattributes \ - "* merge=ours" "text merge=sleep-one-second" && + "* merge=ours" "text merge=sleep-an-hour" && test_config merge.ours.driver true && - test_config merge.sleep-one-second.driver ./sleep-one-second.sh && + test_config merge.sleep-an-hour.driver ./sleep-an-hour.sh && + + # We are testing that the custom merge driver does not block + # index.lock on Windows due to an inherited file handle. + # To ensure that the backgrounded process ran sufficiently + # long (and has been started in the first place), we do not + # ignore the result of the kill command. + # By packaging the command in test_when_finished, we get both + # the correctness check and the clean-up. + test_when_finished "kill \$(cat sleep.pid)" && git merge master ' |