mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'as/merge-attr-sleep' into maint
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
This commit is contained in:
commit
25e298d2c9
|
@ -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
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue