neovim

commit 4e56f7f0beafcd9db1775a76dcf2d2a4ef2867ba
parent 00b7428b3bf5c30ccfa8322f7b8452a764a0abd0
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri, 29 Mar 2024 06:26:01 +0800

test: skip another flaky test on macOS (#28087)


Diffstat:
M
src/nvim/tui/tui.c
 | 
2
+-
M
test/functional/lua/watch_spec.lua
 | 
2
+-
M
test/functional/plugin/lsp_spec.lua
 | 
20
++++++++++++++------

3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
@@ -413,7 +413,7 @@ static void terminfo_start(TUIData *tui)
   // mode 2026
   tui_request_term_mode(tui, kTermModeSynchronizedOutput);
 
-  // Don't use DECRQSS in screen or tmux, as they behave strangely when receving that.
+  // Don't use DECRQSS in screen or tmux, as they behave strangely when receiving it.
   if (tui->unibi_ext.set_underline_style == -1 && !(screen || tmux)) {
     // Query the terminal to see if it supports extended underline.
     tui_query_extended_underline(tui);
diff --git 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
@@ -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)