patch 7.4.2240
Problem: Tests using the sleep time can be flaky.
Solution: Use reltime() if available. (Partly by Shane Harper)
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index edc3c38..24b05be 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -109,19 +109,31 @@
endfunc
" Wait for up to a second for "expr" to become true.
-" Return time slept in milliseconds.
+" Return time slept in milliseconds. With the +reltime feature this can be
+" more than the actual waiting time. Without +reltime it can also be less.
func WaitFor(expr)
- let slept = 0
+ " using reltime() is more accurate, but not always available
+ if has('reltime')
+ let start = reltime()
+ else
+ let slept = 0
+ endif
for i in range(100)
try
if eval(a:expr)
+ if has('reltime')
+ return float2nr(reltimefloat(reltime(start)) * 1000)
+ endif
return slept
endif
catch
endtry
- let slept += 10
+ if !has('reltime')
+ let slept += 10
+ endif
sleep 10m
endfor
+ return 1000
endfunc
" Run Vim, using the "vimcmd" file and "-u NORC".