From 82c5a02050dcc91673d4ef66b4ad20ecf9cae8c8 Mon Sep 17 00:00:00 2001 From: Dundar Göc Date: Sat, 19 Feb 2022 11:11:05 +0100 Subject: ci: skip tests that fail on windows --- test/functional/api/buffer_updates_spec.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/functional/api/buffer_updates_spec.lua') diff --git a/test/functional/api/buffer_updates_spec.lua b/test/functional/api/buffer_updates_spec.lua index c9c9be5406..25ca8cfe4a 100644 --- a/test/functional/api/buffer_updates_spec.lua +++ b/test/functional/api/buffer_updates_spec.lua @@ -7,6 +7,7 @@ local nvim_prog = helpers.nvim_prog local pcall_err = helpers.pcall_err local sleep = helpers.sleep local write_file = helpers.write_file +local iswin = helpers.iswin local origlines = {"original line 1", "original line 2", @@ -823,7 +824,7 @@ describe('API: buffer events:', function() end msg = next_msg() end - assert(false, 'did not match/receive expected nvim_buf_lines_event lines') + assert(iswin(), 'did not match/receive expected nvim_buf_lines_event lines') end it('when :terminal lines change', function() -- cgit From 0545bd21805b25b95ed6290d17e2c5804e9dbd98 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 26 Feb 2022 19:28:18 +0800 Subject: test: use helpers.pending_win32(pending) instead of iswin() --- test/functional/api/buffer_updates_spec.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'test/functional/api/buffer_updates_spec.lua') diff --git a/test/functional/api/buffer_updates_spec.lua b/test/functional/api/buffer_updates_spec.lua index 25ca8cfe4a..e9ad756947 100644 --- a/test/functional/api/buffer_updates_spec.lua +++ b/test/functional/api/buffer_updates_spec.lua @@ -824,6 +824,7 @@ describe('API: buffer events:', function() end msg = next_msg() end + -- FIXME: Windows assert(iswin(), 'did not match/receive expected nvim_buf_lines_event lines') end -- cgit From f8b3a1691faa769c8a57b438eeac8c1cff848444 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 3 Mar 2022 16:07:39 +0800 Subject: test: use helpers.pending_win32(pending) in buffer_updates_spec --- test/functional/api/buffer_updates_spec.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'test/functional/api/buffer_updates_spec.lua') diff --git a/test/functional/api/buffer_updates_spec.lua b/test/functional/api/buffer_updates_spec.lua index e9ad756947..fc09e4cde0 100644 --- a/test/functional/api/buffer_updates_spec.lua +++ b/test/functional/api/buffer_updates_spec.lua @@ -7,7 +7,6 @@ local nvim_prog = helpers.nvim_prog local pcall_err = helpers.pcall_err local sleep = helpers.sleep local write_file = helpers.write_file -local iswin = helpers.iswin local origlines = {"original line 1", "original line 2", @@ -824,11 +823,11 @@ describe('API: buffer events:', function() end msg = next_msg() end - -- FIXME: Windows - assert(iswin(), 'did not match/receive expected nvim_buf_lines_event lines') + assert(false, 'did not match/receive expected nvim_buf_lines_event lines') end it('when :terminal lines change', function() + if helpers.pending_win32(pending) then return end local buffer_lines = {} local expected_lines = {} command('terminal "'..nvim_prog..'" -u NONE -i NONE -n -c "set shortmess+=A"') -- cgit From f49699737c9b24e1af52719974cf3bc770539ef9 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 17 May 2022 21:09:28 +0800 Subject: fix(terminal): do not trim whitespace that is actually in the terminal (#16423) --- test/functional/api/buffer_updates_spec.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/functional/api/buffer_updates_spec.lua') diff --git a/test/functional/api/buffer_updates_spec.lua b/test/functional/api/buffer_updates_spec.lua index fc09e4cde0..097757f53d 100644 --- a/test/functional/api/buffer_updates_spec.lua +++ b/test/functional/api/buffer_updates_spec.lua @@ -785,7 +785,8 @@ describe('API: buffer events:', function() local function lines_subset(first, second) for i = 1,#first do - if first[i] ~= second[i] then + -- need to ignore trailing spaces + if first[i]:gsub(' +$', '') ~= second[i]:gsub(' +$', '') then return false end end -- cgit From 6e414b698cbcc4f1e42564febad030d1a0a52230 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 18 May 2022 12:57:04 +0800 Subject: test: unskip tests on Windows (#18600) Remove the command('qall!') from mksession_spec.lua because it prevents helpers.rmdir() from retrying. Allow extra trailing spaces when matching terminal lines. --- test/functional/api/buffer_updates_spec.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'test/functional/api/buffer_updates_spec.lua') diff --git a/test/functional/api/buffer_updates_spec.lua b/test/functional/api/buffer_updates_spec.lua index 097757f53d..2728dcf74c 100644 --- a/test/functional/api/buffer_updates_spec.lua +++ b/test/functional/api/buffer_updates_spec.lua @@ -828,7 +828,6 @@ describe('API: buffer events:', function() end it('when :terminal lines change', function() - if helpers.pending_win32(pending) then return end local buffer_lines = {} local expected_lines = {} command('terminal "'..nvim_prog..'" -u NONE -i NONE -n -c "set shortmess+=A"') -- cgit From 837360868b557dcb897690178d891c87e91fc27f Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Mon, 13 Jun 2022 13:05:17 +0200 Subject: fix(tests): missing clear() #18927 This was caught in #18674 since it allows test isolation --- test/functional/api/buffer_updates_spec.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/functional/api/buffer_updates_spec.lua') diff --git a/test/functional/api/buffer_updates_spec.lua b/test/functional/api/buffer_updates_spec.lua index 2728dcf74c..3d257e9477 100644 --- a/test/functional/api/buffer_updates_spec.lua +++ b/test/functional/api/buffer_updates_spec.lua @@ -96,6 +96,8 @@ local function reopenwithfolds(b) end describe('API: buffer events:', function() + before_each(clear) + it('when lines are added', function() local b, tick = editoriginal(true) -- cgit