aboutsummaryrefslogtreecommitdiff
path: root/test/functional/terminal
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2017-06-26 14:49:15 +0200
committerBjörn Linse <bjorn.linse@gmail.com>2018-10-15 20:13:11 +0200
commitc8810a51a3a7ef1185b45c07d93f7e6769c5ab55 (patch)
tree55e62aa6c09a729c9c34bd5d4d4d40321f982376 /test/functional/terminal
parent8fd092f3ff15bf70f84ec0d716c5aaa2c7379fa1 (diff)
downloadrneovim-c8810a51a3a7ef1185b45c07d93f7e6769c5ab55.tar.gz
rneovim-c8810a51a3a7ef1185b45c07d93f7e6769c5ab55.tar.bz2
rneovim-c8810a51a3a7ef1185b45c07d93f7e6769c5ab55.zip
tests: improve robustness of immediate successes in screen tests
Diffstat (limited to 'test/functional/terminal')
-rw-r--r--test/functional/terminal/scrollback_spec.lua3
-rw-r--r--test/functional/terminal/tui_spec.lua4
2 files changed, 3 insertions, 4 deletions
diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua
index 5e36fea474..2e236327c8 100644
--- a/test/functional/terminal/scrollback_spec.lua
+++ b/test/functional/terminal/scrollback_spec.lua
@@ -426,9 +426,8 @@ describe("'scrollback' option", function()
curbufmeths.set_option('scrollback', 200)
-- Wait for prompt.
- screen:expect{any='$'}
+ screen:expect{any='%$'}
- wait()
if iswin() then
feed_data('for($i=1;$i -le 30;$i++){Write-Host \"line$i\"}\r')
else
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 834720edc6..365bd2a0be 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -370,7 +370,7 @@ describe('tui FocusGained/FocusLost', function()
{3:-- TERMINAL --} |
]])
feed_data('\027[O')
- screen:expect([[
+ screen:expect{grid=[[
|
{4:~ }|
{4:~ }|
@@ -378,7 +378,7 @@ describe('tui FocusGained/FocusLost', function()
{5:[No Name] }|
:{1: } |
{3:-- TERMINAL --} |
- ]])
+ ]], unchanged=true}
end)
it('in cmdline-mode', function()