aboutsummaryrefslogtreecommitdiff
path: root/test/functional/api/server_requests_spec.lua
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-09-04 06:58:04 -0700
committerGitHub <noreply@github.com>2019-09-04 06:58:04 -0700
commit540360a775a62db5c2722bfd89b6aa91b577d945 (patch)
tree9c0d0f5a95da8151468a26964dc2a36b586aa7bc /test/functional/api/server_requests_spec.lua
parent9cc8064864374cf85c4273299d42094e3c687941 (diff)
downloadrneovim-540360a775a62db5c2722bfd89b6aa91b577d945.tar.gz
rneovim-540360a775a62db5c2722bfd89b6aa91b577d945.tar.bz2
rneovim-540360a775a62db5c2722bfd89b6aa91b577d945.zip
test: is_os() #10933
- Move os_name() up to "global helpers". - Rename it to is_os(). - Make it depend on uname() instead of a running Nvim instance.
Diffstat (limited to 'test/functional/api/server_requests_spec.lua')
-rw-r--r--test/functional/api/server_requests_spec.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua
index ddd044a10f..a20667de40 100644
--- a/test/functional/api/server_requests_spec.lua
+++ b/test/functional/api/server_requests_spec.lua
@@ -180,7 +180,7 @@ describe('server -> client', function()
end)
describe('recursive (child) nvim client', function()
- if helpers.isCI('travis') and helpers.os_name() == 'osx' then
+ if helpers.isCI('travis') and helpers.is_os('mac') then
-- XXX: Hangs Travis macOS since e9061117a5b8f195c3f26a5cb94e18ddd7752d86.
pending("[Hangs on Travis macOS. #5002]", function() end)
return
@@ -339,7 +339,7 @@ describe('server -> client', function()
describe('connecting to its own pipe address', function()
it('does not deadlock', function()
- if not helpers.isCI('travis') and helpers.os_name() == 'osx' then
+ if not helpers.isCI('travis') and helpers.is_os('mac') then
-- It does, in fact, deadlock on QuickBuild. #6851
pending("deadlocks on QuickBuild", function() end)
return