mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-09 20:15:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

test/inccommand_spec: avoid indeterminism

Browse Source 
- Use shell-test.c to avoid the squishiness of system shells.
- Use screen:expect_unchanged() to avoid hardcoded (brittle) test.

Fails correctly if 5020daa6e5 is reverted (remove terminal_check(),
restore redraw() in refresh_timer_cb()):

    [  ERROR   ] test/functional/ui/inccommand_spec.lua @ 2550: :substitute with inccommand during :terminal activity
    test/functional/helpers.lua:402:
    retry() attempts: 2
    test/functional/ui/screen.lua:579: Row 8 did not match.
    Expected:
      |foo bar baz                   |
      |bar baz fox                   |
      |bar foo baz                   |
      |{15:~                             }|
      |{15:~                             }|
      |{15:~                             }|
      |{11:[No Name] [+]                 }|
      |*26: xxx                       |
      |27: xxx                       |
      |28: xxx                       |
      |29: xxx                       |
      |30: xxx                       |
      |                              |
      |{10:term                          }|
      |:%s/foo/ZZZ^                   |
    Actual:
      |foo bar baz                   |
      |bar baz fox                   |
      |bar foo baz                   |
      |{15:~                             }|
      |{15:~                             }|
      |{15:~                             }|
      |{11:[No Name] [+]                 }|
      |*107: xxx                      |
      |108: xxx                      |
      |109: xxx                      |
      |110: xxx                      |
      |111: xxx                      |
      |                              |
      |{10:term                          }|
      |:%s/foo/ZZZ^                   |
This commit is contained in:
Justin M. Keyes
2019-08-09 23:31:41 +02:00
parent 53b7f60805
commit 641c5b3f08
1 changed files with 5 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
test/functional/ui/inccommand_spec.lua
View File

@@ -16,8 +16,8 @@ local retry = helpers.retry
local source = helpers.source local source = helpers.source
local wait = helpers.wait local wait = helpers.wait
local nvim = helpers.nvim local nvim = helpers.nvim
local iswin = helpers.iswin
local sleep = helpers.sleep local sleep = helpers.sleep
local nvim_dir = helpers.nvim_dir
local default_text = [[ local default_text = [[
Inc substitution on Inc substitution on
@@ -2555,56 +2555,18 @@ it(':substitute with inccommand during :terminal activity', function()
clear() clear()
command("set cmdwinheight=3") command("set cmdwinheight=3")
if iswin() then feed([[:terminal "]]..nvim_dir..[[/shell-test" REP 5000 xxx<cr>]])
feed([[:terminal for /L \%I in (1,1,5000) do @(echo xxx & echo xxx & echo xxx)<cr>]])
else
feed([[:terminal for i in $(seq 1 5000); do printf 'xxx\nxxx\nxxx\n'; done<cr>]])
end
command('file term') command('file term')
feed('G') -- Follow :terminal output.
command('new') command('new')
common_setup(screen, 'split', 'foo bar baz\nbar baz fox\nbar foo baz') common_setup(screen, 'split', 'foo bar baz\nbar baz fox\nbar foo baz')
command('wincmd =') command('wincmd =')
-- Wait for terminal output.
screen:expect([[
bar baz fox |
bar foo ba^z |
{15:~ }|
{15:~ }|
{15:~ }|
{15:~ }|
{11:[No Name] [+] }|
xxx |
xxx |
xxx |
xxx |
xxx |
xxx |
{10:term }|
|
]])
feed('gg') feed('gg')
feed(':%s/foo/ZZZ') feed(':%s/foo/ZZZ')
sleep(20) -- Allow some terminal activity. sleep(20) -- Allow some terminal activity.
screen:expect([[ helpers.wait()
{12:ZZZ} bar baz | screen:expect_unchanged()
bar baz fox |
bar {12:ZZZ} baz |
{15:~ }|
{15:~ }|
{15:~ }|
{11:[No Name] [+] }|
xxx |
xxx |
{10:term }|
|1| {12:ZZZ} bar baz |
|3| bar {12:ZZZ} baz |
{15:~ }|
{10:[Preview] }|
:%s/foo/ZZZ^ |
]])
end) end)
end) end)