mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-22 13:39:05 +02:00
Code

Revert "t6026-merge-attr: don't fail if sleep exits early"

Browse Source 
This reverts commit 734fde2d7167e4b20d2ff6062ade3846949b0741.

The point of the test is that the stray process was still running
when 'git merge' did its thing through its completion, so a failure
to "kill" it means we didn't give a condition to the test to trigger
a possible future breakage.  Appending "|| :" to the "kill" is
sweeping a test-bug under the rug.
This commit is contained in:
Junio C Hamano 2016-11-10 15:55:13 -08:00
parent 3b03097d66
commit b36b716cf6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t6026-merge-attr.sh
View File

@ -187,7 +187,7 @@ test_expect_success 'custom merge does not lock index' '
sleep 1 & sleep 1 &
echo $! >sleep.pid echo $! >sleep.pid
EOF EOF
test_when_finished "kill \$(cat sleep.pid) || :" && test_when_finished "kill \$(cat sleep.pid)" &&
test_write_lines >.gitattributes \ test_write_lines >.gitattributes \
"* merge=ours" "text merge=sleep-one-second" && "* merge=ours" "text merge=sleep-one-second" &&