From d82a6ca72aca57d89cfb8954abf2ae3980f85c04 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 19 Apr 2023 10:53:12 +0800 Subject: [PATCH] vim-patch:9.0.0561: when a test gets stuck it just hangs forever Problem: When a test gets stuck it just hangs forever. Solution: Set a timeout of 30 seconds. https://github.com/vim/vim/commit/3bcd0ddc2deb34794c735c6ea0b8f964b510c6db Note: This doesn't cause test_timers.vim failures in Nvim because there is a SetUp() function that calls timer_stopall(). Co-authored-by: Bram Moolenaar --- test/old/testdir/runtest.vim | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/old/testdir/runtest.vim b/test/old/testdir/runtest.vim index c47272dcdc..114a3229d4 100644 --- a/test/old/testdir/runtest.vim +++ b/test/old/testdir/runtest.vim @@ -152,6 +152,17 @@ if has('reltime') let g:func_start = reltime() endif +" Invoked when a test takes too much time. +func TestTimeout(id) + split test.log + call append(line('$'), '') + call append(line('$'), 'Test timed out: ' .. g:testfunc) + write + call add(v:errors, 'Test timed out: ' . g:testfunc) + + cquit! 42 +endfunc + func RunTheTest(test) let prefix = '' if has('reltime') @@ -160,6 +171,12 @@ func RunTheTest(test) endif echo prefix .. 'Executing ' .. a:test + if has('timers') + " No test should take longer than 30 seconds. If it takes longer we + " assume we are stuck and need to break out. + let test_timeout_timer = timer_start(30000, 'TestTimeout') + endif + " Avoid stopping at the "hit enter" prompt set nomore @@ -225,6 +242,10 @@ func RunTheTest(test) endtry endif + if has('timers') + call timer_stop(test_timeout_timer) + endif + " Clear any autocommands and put back the catch-all for SwapExists. au! au SwapExists * call HandleSwapExists()