fixup: rename ci.ci to ci.any

neovim · Nov 11, 2022 · e765a8e · e765a8e
1 parent f953951
commit e765a8e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/test/functional/api/server_notifications_spec.lua b/test/functional/api/server_notifications_spec.lua
@@ -78,7 +78,7 @@ describe('notify', function()
  end)
 
  it('cancels stale events on channel close', function()
- if is.ci.ci then
+ if is.ci.any then
  pending('hangs on CI #14083 #15251')
  return
  elseif helpers.skip_fragile(pending) then

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
@@ -2323,7 +2323,7 @@ describe('API', function()
  end)
 
  local it_maybe_pending = it
- if helpers.is.ci.ci and os.getenv('CONFIGURATION') == 'MSVC_32' then
+ if helpers.is.ci.any and os.getenv('CONFIGURATION') == 'MSVC_32' then
  -- For "works with &opt" (flaky on MSVC_32), but not easy to skip alone. #10241
  it_maybe_pending = pending
  end

diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
@@ -874,7 +874,7 @@ function module.alter_slashes(obj)
 end
 
 local load_factor = 1
-if global_helpers.is.ci.ci then
+if global_helpers.is.ci.any then
  -- Compute load factor only once (but outside of any tests).
  module.clear()
  module.request('nvim_command', 'source src/nvim/testdir/load.vim')

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
@@ -316,7 +316,7 @@ describe('LSP', function()
  end)
 
  it('should succeed with manual shutdown', function()
- if is.ci.ci then
+ if is.ci.any then
  pending('hangs the build on CI #14028, re-enable with freeze timeout #14204')
  return
  elseif helpers.skip_fragile(pending) then

diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
@@ -1507,7 +1507,7 @@ describe('ui/msg_puts_printf', function()
  if (exc_exec('lang ja_JP.UTF-8') ~= 0) then
  pending('Locale ja_JP.UTF-8 not supported', function() end)
  return
- elseif is.ci.ci then
+ elseif is.ci.any then
  -- Fails non--Windows CI. Message catalog directory issue?
  pending('fails on unix CI', function() end)
  return

diff --git a/test/helpers.lua b/test/helpers.lua
@@ -823,7 +823,7 @@ module.is = {
  ci = {
  cirrus = isCI('cirrus'),
  github = isCI('github'),
- ci = isCI()
+ any = isCI()
  }
 }