diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-01-23 19:36:11 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-01-23 19:36:11 -0300 |
| commit | d84cbfa4dc8b6d1ba7b9c72ad7fb9c40e05ae1d9 (patch) | |
| tree | 23d796c7703f53b9ea26377494b2a5fdb6677a24 /test/functional/ui/screen.lua | |
| parent | 641df7be9cc8168399ea05d61f7009770880f28f (diff) | |
| parent | cbc23d93b9f8dd8043836fa2d0ca36667a19a849 (diff) | |
| download | rneovim-d84cbfa4dc8b6d1ba7b9c72ad7fb9c40e05ae1d9.tar.gz rneovim-d84cbfa4dc8b6d1ba7b9c72ad7fb9c40e05ae1d9.tar.bz2 rneovim-d84cbfa4dc8b6d1ba7b9c72ad7fb9c40e05ae1d9.zip | |
Merge PR #1877 'Fix functional test suite hang when a test fails'
Diffstat (limited to 'test/functional/ui/screen.lua')
| -rw-r--r-- | test/functional/ui/screen.lua | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua index 29bbe69d8b..ef99c2a536 100644 --- a/test/functional/ui/screen.lua +++ b/test/functional/ui/screen.lua @@ -85,6 +85,10 @@ Screen.__index = Screen local debug_screen +local default_screen_timeout = 2500 +if os.getenv('VALGRIND') then + default_screen_timeout = 7500 +end function Screen.debug(command) if not command then @@ -187,12 +191,12 @@ function Screen:wait(check, timeout) end return true end - run(nil, notification_cb, nil, timeout or 5000) + run(nil, notification_cb, nil, timeout or default_screen_timeout) if not checked then err = check() end if err then - error(err) + assert(false, err) end end |