diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-03-18 00:16:23 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-03-19 14:13:21 +0300 |
| commit | 3cd7bf31e2351eb2874f8431d290a3d36b0b075e (patch) | |
| tree | c3757584a199cd2304e3c76f67c43e6d64d7a5ab | |
| parent | 0e9286a19ed51ba9a2d6bfd06432c90e36cad4bd (diff) | |
| download | rneovim-3cd7bf31e2351eb2874f8431d290a3d36b0b075e.tar.gz rneovim-3cd7bf31e2351eb2874f8431d290a3d36b0b075e.tar.bz2 rneovim-3cd7bf31e2351eb2874f8431d290a3d36b0b075e.zip | |
tests: Fix repeated_popen_r usage, rename the function
| -rw-r--r-- | test/functional/core/main_spec.lua | 5 | ||||
| -rw-r--r-- | test/helpers.lua | 4 | ||||
| -rw-r--r-- | test/unit/preprocess.lua | 24 |
3 files changed, 16 insertions, 17 deletions
diff --git a/test/functional/core/main_spec.lua b/test/functional/core/main_spec.lua index a374b4c040..cc781a59a1 100644 --- a/test/functional/core/main_spec.lua +++ b/test/functional/core/main_spec.lua @@ -9,7 +9,7 @@ local nvim_prog = helpers.nvim_prog local write_file = helpers.write_file local popen_w = global_helpers.popen_w -local repeated_popen_r = global_helpers.repeated_popen_r +local repeated_read_cmd = global_helpers.repeated_read_cmd describe('Command-line option', function() describe('-s', function() @@ -48,10 +48,9 @@ describe('Command-line option', function() eq(nil, lfs.attributes(fname)) eq(true, not not dollar_fname:find('%$%w+')) write_file(dollar_fname, ':call setline(1, "100500")\n:wqall!\n') - local pipe = repeated_popen_r( + local stdout = repeated_read_cmd( nvim_prog, '-u', 'NONE', '-i', 'NONE', '--headless', '-s', dollar_fname, fname) - local stdout = pipe:read('*a') eq('', stdout) local attrs = lfs.attributes(fname) eq(#('100500\n'), attrs.size) diff --git a/test/helpers.lua b/test/helpers.lua index be83ff314b..d739400c71 100644 --- a/test/helpers.lua +++ b/test/helpers.lua @@ -257,7 +257,7 @@ local function which(exe) end end -local function repeated_popen_r(...) +local function repeated_read_cmd(...) for _ = 1, 10 do local stream = popen_r(...) local ret = stream:read('*a') @@ -286,5 +286,5 @@ return { argss_to_cmd = argss_to_cmd, popen_r = popen_r, popen_w = popen_w, - repeated_popen_r = repeated_popen_r, + repeated_read_cmd = repeated_read_cmd, } diff --git a/test/unit/preprocess.lua b/test/unit/preprocess.lua index ac0c5a85c1..1073855a7d 100644 --- a/test/unit/preprocess.lua +++ b/test/unit/preprocess.lua @@ -5,7 +5,7 @@ local ffi = require("ffi") local global_helpers = require('test.helpers') local argss_to_cmd = global_helpers.argss_to_cmd -local repeated_popen_r = global_helpers.repeated_popen_r +local repeated_read_cmd = global_helpers.repeated_read_cmd local ccs = {} @@ -162,10 +162,10 @@ function Gcc:filter_standard_defines(defines) local pseudoheader_fname = 'tmp_empty_pseudoheader.h' local pseudoheader_file = io.open(pseudoheader_fname, 'w') pseudoheader_file:close() - local standard_defines = repeated_popen_r(self.path, - self.preprocessor_extra_flags, - self.get_defines_extra_flags, - {pseudoheader_fname}) + local standard_defines = repeated_read_cmd(self.path, + self.preprocessor_extra_flags, + self.get_defines_extra_flags, + {pseudoheader_fname}) os.remove(pseudoheader_fname) self.standard_defines = {} for line in standard_defines:gmatch('[^\n]+') do @@ -194,9 +194,9 @@ function Gcc:preprocess(previous_defines, ...) pseudoheader_file:flush() pseudoheader_file:close() - local defines = repeated_popen_r(self.path, self.preprocessor_extra_flags, - self.get_defines_extra_flags, - {pseudoheader_fname}) + local defines = repeated_read_cmd(self.path, self.preprocessor_extra_flags, + self.get_defines_extra_flags, + {pseudoheader_fname}) defines = self:filter_standard_defines(defines) -- lfs = require("lfs") @@ -205,10 +205,10 @@ function Gcc:preprocess(previous_defines, ...) -- io.stderr\write("CWD: #{lfs.currentdir!}\n") -- io.stderr\write("CMD: #{cmd}\n") - local declarations = repeated_popen_r(self.path, - self.preprocessor_extra_flags, - self.get_declarations_extra_flags, - {pseudoheader_fname}) + local declarations = repeated_read_cmd(self.path, + self.preprocessor_extra_flags, + self.get_declarations_extra_flags, + {pseudoheader_fname}) os.remove(pseudoheader_fname) |