Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/plugin_helper/test_child_process.rb
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ def configure(conf)
unless Fluent.windows?
test 'can specify subprocess name' do
io = IO.popen([["cat", "caaaaaaaaaaat"], '-'])
process_naming_enabled = (open("|ps opid,cmd"){|_io| _io.readlines }.count{|line| line.include?("caaaaaaaaaaat") } > 0)
process_naming_enabled = (IO.popen(["ps", "opid,cmd"]){|_io| _io.readlines }.count{|line| line.include?("caaaaaaaaaaat") } > 0)
Process.kill(:TERM, io.pid) rescue nil
io.close rescue nil

Expand All @@ -586,7 +586,7 @@ def configure(conf)
m.lock
ran = true
pids << @d.child_process_id
proc_lines += open("|ps opid,cmd"){|_io| _io.readlines }
proc_lines += IO.popen(["ps", "opid,cmd"]){|_io| _io.readlines }
m.unlock
readio.read
end
Expand Down Expand Up @@ -645,8 +645,8 @@ def configure(conf)
unless Fluent.windows?
test 'can change working directory' do
# check my real /tmp directory (for mac)
cmd = %[|ruby -e 'Dir.chdir("/tmp"); puts Dir.pwd']
mytmpdir = open(cmd){|io| io.read.chomp }
cmd = ['ruby', '-e', 'Dir.chdir("/tmp"); puts Dir.pwd']
mytmpdir = IO.popen(cmd){|io| io.read.chomp }

m = Mutex.new
str = nil
Expand Down