undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sg/t1404-update-ref-test-timeout'

Browse Source 
An attempt to unflake a test a bit.

* sg/t1404-update-ref-test-timeout:
  t1404: increase core.packedRefsTimeout to avoid occasional test failure
This commit is contained in:
Junio C Hamano 2018-09-17 13:53:47 -07:00
commit ea64414426
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t1404-update-ref-errors.sh
View File

@ -559,9 +559,9 @@ test_expect_success 'no bogus intermediate values during delete' '
{ {
# Note: the following command is intentionally run in the # Note: the following command is intentionally run in the
# background. We increase the timeout so that `update-ref` # background. We increase the timeout so that `update-ref`
# attempts to acquire the `packed-refs` lock for longer than # attempts to acquire the `packed-refs` lock for much longer
# it takes for us to do the check then delete it: # than it takes for us to do the check then delete it:
git -c core.packedrefstimeout=3000 update-ref -d $prefix/foo & git -c core.packedrefstimeout=30000 update-ref -d $prefix/foo &
} && } &&
pid2=$! && pid2=$! &&
# Give update-ref plenty of time to get to the point where it tries # Give update-ref plenty of time to get to the point where it tries