Skip to content

Commit

Permalink
Merge pull request #4369 from kenhys/use-io-popen
Browse files Browse the repository at this point in the history
test: use IO#popen instead of Kernel#open
  • Loading branch information
ashie authored Jan 10, 2024
2 parents d086b29 + 6d76370 commit cbc10e3
Showing 1 changed file with 4 additions and 4 deletions.
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 @@ -559,7 +559,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 @@ -576,7 +576,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 @@ -635,8 +635,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

0 comments on commit cbc10e3

Please sign in to comment.