diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-07-02 09:27:32 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-07-02 09:27:32 +0800 |
| commit | 1514cdc7d8863eeee6b04883b1c50aac40048b49 (patch) | |
| tree | 5f4cba6d5746d704cae7fad886afe08f7e6fd06f /test/functional/api/server_requests_spec.lua | |
| parent | b96f43f2b86cbac3f34691fd97bce4cdb9d6aed9 (diff) | |
| parent | ca4633bfe4d0f58bd5fb7343d282fafb71f3a3ee (diff) | |
| download | rneovim-1514cdc7d8863eeee6b04883b1c50aac40048b49.tar.gz rneovim-1514cdc7d8863eeee6b04883b1c50aac40048b49.tar.bz2 rneovim-1514cdc7d8863eeee6b04883b1c50aac40048b49.zip | |
Merge remote-tracking branch 'upstream/master'
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 == '\\') |