diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-08-09 21:31:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 21:31:30 -0400 |
| commit | 3b785b32f9c85f6f2547a509fb6faa4a717f19cf (patch) | |
| tree | f6dd1aa56b0abc7884922483cc64a3d383224f7b | |
| parent | 3ff252ca86442e73c7bf56f63fe696043883388b (diff) | |
| parent | 348fcee5fb5c9abb0bbe86e1a018abd6fb0d8074 (diff) | |
| download | rneovim-3b785b32f9c85f6f2547a509fb6faa4a717f19cf.tar.gz rneovim-3b785b32f9c85f6f2547a509fb6faa4a717f19cf.tar.bz2 rneovim-3b785b32f9c85f6f2547a509fb6faa4a717f19cf.zip | |
Merge #5188 from justinmk/travis-test-hack
Disable test on Travis macOS/OSX.
| -rw-r--r-- | test/functional/api/server_requests_spec.lua | 6 | ||||
| -rw-r--r-- | test/functional/core/job_spec.lua | 7 | ||||
| -rw-r--r-- | test/functional/legacy/file_perm_spec.lua | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua index 54095112fb..eb63834cb0 100644 --- a/test/functional/api/server_requests_spec.lua +++ b/test/functional/api/server_requests_spec.lua @@ -137,6 +137,12 @@ describe('server -> client', function() end) describe('when the client is a recursive vim instance', function() + if os.getenv("TRAVIS") and helpers.os_name() == "osx" then + -- XXX: Hangs Travis OSX since e9061117a5b8f195c3f26a5cb94e18ddd7752d86. + pending("[Hangs on Travis OSX. #5002]", function() end) + return + end + before_each(function() nvim('command', "let vim = rpcstart('"..nvim_prog.."', ['-u', 'NONE', '-i', 'NONE', '--cmd', 'set noswapfile', '--embed'])") neq(0, eval('vim')) diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua index 61ecdd1835..1d11374e4d 100644 --- a/test/functional/core/job_spec.lua +++ b/test/functional/core/job_spec.lua @@ -105,6 +105,13 @@ describe('jobs', function() end) it("will not buffer data if it doesn't end in newlines", function() + if os.getenv("TRAVIS") and os.getenv("CC") == "gcc-4.9" + and helpers.os_name() == "osx" then + -- XXX: Hangs Travis OSX since e9061117a5b8f195c3f26a5cb94e18ddd7752d86. + pending("[Hangs on Travis OSX. #5002]", function() end) + return + end + nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)") nvim('command', 'call jobsend(j, "abc\\nxyz")') eq({'notification', 'stdout', {0, {'abc', 'xyz'}}}, next_msg()) diff --git a/test/functional/legacy/file_perm_spec.lua b/test/functional/legacy/file_perm_spec.lua index 98bdf630dd..9ebbfd25e4 100644 --- a/test/functional/legacy/file_perm_spec.lua +++ b/test/functional/legacy/file_perm_spec.lua @@ -21,7 +21,7 @@ describe('Test getting and setting file permissions', function() eq(9, call('len', call('getfperm', tempfile))) eq(1, call('setfperm', tempfile, 'rwx------')) - if helpers.os_name == 'windows' then + if helpers.os_name() == 'windows' then eq('rw-rw-rw-', call('getfperm', tempfile)) else eq('rwx------', call('getfperm', tempfile)) |