aboutsummaryrefslogtreecommitdiff
path: root/test/functional/api/server_requests_spec.lua
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-08-05 10:17:37 +0200
committerGitHub <noreply@github.com>2019-08-05 10:17:37 +0200
commit51440204e7973672f906db8e53035cfd228ce444 (patch)
tree6c69695a8822cb42c4d5f1ff1cf23b440d9455ff /test/functional/api/server_requests_spec.lua
parent6871445dfe80939df81517870f0b29a2b40dd9d9 (diff)
parentd4a0b6c4e1d78f19bf5879b113c5252d5a4f2e5c (diff)
downloadrneovim-51440204e7973672f906db8e53035cfd228ce444.tar.gz
rneovim-51440204e7973672f906db8e53035cfd228ce444.tar.bz2
rneovim-51440204e7973672f906db8e53035cfd228ce444.zip
Merge #10695 from justinmk/test-fixes
test: various fixes
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 07218f11dd..dbe9f20412 100644
--- a/test/functional/api/server_requests_spec.lua
+++ b/test/functional/api/server_requests_spec.lua
@@ -181,7 +181,7 @@ describe('server -> client', function()
end)
describe('recursive (child) nvim client', function()
- if os.getenv("TRAVIS") and helpers.os_name() == "osx" then
+ if helpers.isCI('travis') and helpers.os_name() == 'osx' then
-- XXX: Hangs Travis macOS since e9061117a5b8f195c3f26a5cb94e18ddd7752d86.
pending("[Hangs on Travis macOS. #5002]", function() end)
return
@@ -340,7 +340,7 @@ describe('server -> client', function()
describe('connecting to its own pipe address', function()
it('does not deadlock', function()
- if not os.getenv("TRAVIS") and helpers.os_name() == "osx" then
+ if not helpers.isCI('travis') and helpers.os_name() == 'osx' then
-- It does, in fact, deadlock on QuickBuild. #6851
pending("deadlocks on QuickBuild", function() end)
return