diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-11-21 06:02:24 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-05-12 00:43:28 +0200 |
| commit | 24f9dd73d5f78bad48ac6dd4e2615ccdb95d9daa (patch) | |
| tree | aa7c2eb06ec28bfb815a8c5c2194132e03356932 | |
| parent | ab7d9ae19356aa2b1a3c12a9846bc279d159e763 (diff) | |
| download | rneovim-24f9dd73d5f78bad48ac6dd4e2615ccdb95d9daa.tar.gz rneovim-24f9dd73d5f78bad48ac6dd4e2615ccdb95d9daa.tar.bz2 rneovim-24f9dd73d5f78bad48ac6dd4e2615ccdb95d9daa.zip | |
test/channels_spec: cleanup
- Remove stray print()
- Use uname() instead of system('uname')
| -rw-r--r-- | test/functional/core/channels_spec.lua | 8 | ||||
| -rw-r--r-- | test/functional/eval/api_functions_spec.lua | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/functional/core/channels_spec.lua b/test/functional/core/channels_spec.lua index 7b89172f92..0137092eb5 100644 --- a/test/functional/core/channels_spec.lua +++ b/test/functional/core/channels_spec.lua @@ -1,3 +1,5 @@ +local global_helpers = require('test.helpers') +local uname = global_helpers.uname local helpers = require('test.functional.helpers')(after_each) local clear, eq, eval, next_msg, ok, source = helpers.clear, helpers.eq, @@ -7,6 +9,7 @@ local sleep = helpers.sleep local spawn, nvim_argv = helpers.spawn, helpers.nvim_argv local set_session = helpers.set_session local nvim_prog = helpers.nvim_prog +local os_name = helpers.os_name local retry = helpers.retry local expect_twostreams = helpers.expect_twostreams @@ -138,9 +141,8 @@ describe('channels', function() command("call chansend(id, 'incomplet\004')") - local is_freebsd = eval("system('uname') =~? 'FreeBSD'") == 1 - local bsdlike = is_freebsd or (helpers.os_name() == "osx") - print("bsdlike:", bsdlike) + local is_freebsd = (string.lower(uname()) == 'freebsd') + local bsdlike = is_freebsd or (os_name() == "osx") local extra = bsdlike and "^D\008\008" or "" expect_twoline(id, "stdout", "incomplet"..extra, "[1, ['incomplet'], 'stdin']", true) diff --git a/test/functional/eval/api_functions_spec.lua b/test/functional/eval/api_functions_spec.lua index 6f440c7d82..40d06b599f 100644 --- a/test/functional/eval/api_functions_spec.lua +++ b/test/functional/eval/api_functions_spec.lua @@ -6,7 +6,7 @@ local clear, curbufmeths = helpers.clear, helpers.curbufmeths local exc_exec, expect, eval = helpers.exc_exec, helpers.expect, helpers.eval local insert = helpers.insert -describe('api functions', function() +describe('eval-API', function() before_each(clear) it("work", function() |