diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-07-15 18:56:45 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-07-15 18:56:45 +0300 |
| commit | 69719e658c48bb5e95a7b57d5813ed4dc48e68e3 (patch) | |
| tree | c4f8584a7437ea6127389b26ff6876404cb58ce7 /test/functional/api/server_requests_spec.lua | |
| parent | 7ab152aaa58f493e54d03a15960b8a288196e588 (diff) | |
| parent | 8898793adeb3a82fe50da4258c30940e10ebcc9d (diff) | |
| download | rneovim-69719e658c48bb5e95a7b57d5813ed4dc48e68e3.tar.gz rneovim-69719e658c48bb5e95a7b57d5813ed4dc48e68e3.tar.bz2 rneovim-69719e658c48bb5e95a7b57d5813ed4dc48e68e3.zip | |
Merge branch 'master' into colored-cmdline
Diffstat (limited to 'test/functional/api/server_requests_spec.lua')
| -rw-r--r-- | test/functional/api/server_requests_spec.lua | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua index cf15062325..6a32f979ea 100644 --- a/test/functional/api/server_requests_spec.lua +++ b/test/functional/api/server_requests_spec.lua @@ -282,8 +282,13 @@ describe('server -> client', function() end) end) - describe('when connecting to its own pipe adress', function() - it('it does not deadlock', 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 + -- It does, in fact, deadlock on QuickBuild. #6851 + pending("deadlocks on QuickBuild", function() end) + return + end local address = funcs.serverlist()[1] local first = string.sub(address,1,1) ok(first == '/' or first == '\\') |