From 4e56f7f0beafcd9db1775a76dcf2d2a4ef2867ba Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 29 Mar 2024 06:26:01 +0800 Subject: test: skip another flaky test on macOS (#28087) --- test/functional/lua/watch_spec.lua | 2 +- test/functional/plugin/lsp_spec.lua | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/functional/lua/watch_spec.lua b/test/functional/lua/watch_spec.lua index 8b6efc3fe4..0da4b3164d 100644 --- a/test/functional/lua/watch_spec.lua +++ b/test/functional/lua/watch_spec.lua @@ -22,12 +22,12 @@ describe('vim._watch', function() local function run(watchfunc) it('detects file changes (watchfunc=' .. watchfunc .. '())', function() if watchfunc == 'fswatch' then + skip(is_os('win'), 'not supported on windows') skip(is_os('mac'), 'flaky test on mac') skip( not is_ci() and helpers.fn.executable('fswatch') == 0, 'fswatch not installed and not on CI' ) - skip(is_os('win'), 'not supported on windows') end if watchfunc == 'watch' then diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua index eda4c95889..788cc8d6f8 100644 --- a/test/functional/plugin/lsp_spec.lua +++ b/test/functional/plugin/lsp_spec.lua @@ -4537,18 +4537,26 @@ describe('LSP', function() string.format('sends notifications when files change (watchfunc=%s)', watchfunc), function() if watchfunc == 'fswatch' then + skip(is_os('win'), 'not supported on windows') + skip(is_os('mac'), 'flaky test on mac') skip( not is_ci() and fn.executable('fswatch') == 0, 'fswatch not installed and not on CI' ) - skip(is_os('win'), 'not supported on windows') - skip(is_os('mac'), 'flaky') end - skip( - is_os('bsd'), - 'kqueue only reports events on watched folder itself, not contained files #26110' - ) + if watchfunc == 'watch' then + skip(is_os('mac'), 'flaky test on mac') + skip( + is_os('bsd'), + 'Stopped working on bsd after 3ca967387c49c754561c3b11a574797504d40f38' + ) + else + skip( + is_os('bsd'), + 'kqueue only reports events on watched folder itself, not contained files #26110' + ) + end local root_dir = tmpname() os.remove(root_dir) -- cgit