mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-07 23:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

test/functional: retry/Screen: failure instead of error #11173

Browse Source 
- Running out of retries, or unexpected screen state should make the
  test FAIL, not ERROR.
- Uses levels to report the location of the caller.
- Improve message with retry-failure (formatting).

Before:

    [ RUN      ] test: 103.53 ms ERR
    test/functional/helpers.lua:388:
    retry() attempts: 1
    test/functional/ui/screen.lua:587: Row 1 did not match.
    Expected:
      |*X^                         |
      |{0:~                        }|
      |{0:~                        }|
      |                         |
    Actual:
      |*^                         |
      |{0:~                        }|
      |{0:~                        }|
      |                         |

    To print the expect() call that would assert the current screen state, use
    screen:snapshot_util(). In case of non-deterministic failures, use
    screen:redraw_debug() to show all intermediate screen states.

    stack traceback:
            test/functional/helpers.lua:388: in function 'retry'
            test/functional/test_spec.lua:24: in function <test/functional/test_spec.lua:23>

After:

    [ RUN      ] test: 105.22 ms FAIL
    test/functional/test_spec.lua:24: stopping after 1 retry() attempts.
    test/functional/test_spec.lua:25: Row 1 did not match.
    Expected:
      |*X^                         |
      |{0:~                        }|
      |{0:~                        }|
      |                         |
    Actual:
      |*^                         |
      |{0:~                        }|
      |{0:~                        }|
      |                         |

    To print the expect() call that would assert the current screen state, use
    screen:snapshot_util(). In case of non-deterministic failures, use
    screen:redraw_debug() to show all intermediate screen states.

    stack traceback:
            test/functional/helpers.lua:389: in function 'retry'
            test/functional/test_spec.lua:24: in function <test/functional/test_spec.lua:23>
This commit is contained in:
Daniel Hahler
2019-10-19 23:15:07 +02:00
committed by Justin M. Keyes
parent 3de4dc539a
commit d89ec55c45
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/functional/helpers.lua
View File

@@ -1,4 +1,5 @@
require('coxpcall') require('coxpcall')
local busted = require('busted')
local luv = require('luv') local luv = require('luv')
local lfs = require('lfs') local lfs = require('lfs')
local mpack = require('mpack') local mpack = require('mpack')
@@ -385,7 +386,7 @@ function module.retry(max, max_ms, fn)
end end
luv.update_time() -- Update cached value of luv.now() (libuv: uv_now()). luv.update_time() -- Update cached value of luv.now() (libuv: uv_now()).
if (max and tries >= max) or (luv.now() - start_time > timeout) then if (max and tries >= max) or (luv.now() - start_time > timeout) then
error("\nretry() attempts: "..tostring(tries).."\n"..tostring(result)) busted.fail(string.format("retry() attempts: %d\n%s", tries, tostring(result)), 2)
end end
tries = tries + 1 tries = tries + 1
luv.sleep(20) -- Avoid hot loop... luv.sleep(20) -- Avoid hot loop...

3
test/functional/ui/screen.lua
View File

@@ -71,6 +71,7 @@
-- To debug screen tests, see Screen:redraw_debug(). -- To debug screen tests, see Screen:redraw_debug().
local helpers = require('test.functional.helpers')(nil) local helpers = require('test.functional.helpers')(nil)
local busted = require('busted')
local deepcopy = helpers.deepcopy local deepcopy = helpers.deepcopy
local shallowcopy = helpers.shallowcopy local shallowcopy = helpers.shallowcopy
local concat_tables = helpers.concat_tables local concat_tables = helpers.concat_tables
@@ -574,7 +575,7 @@ asynchronous (feed(), nvim_input()) and synchronous API calls.
if err then if err then
assert(false, err) busted.fail(err, 3)
elseif did_warn then elseif did_warn then
local tb = debug.traceback() local tb = debug.traceback()
local index = string.find(tb, '\n%s*%[C]') local index = string.find(tb, '\n%s*%[C]')