From b6cc798e7858b93468d503315dfca2b698aabda1 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 22 Oct 2009 11:22:11 +0000 Subject: * test/ruby/envutil.rb (assert_in_out_err): test_stdout and test_stderr should be an array. * test/ruby/test_rubyoptions.rb (test_notfound): test_stdin of assert_in_out_err should be a string. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ test/ruby/envutil.rb | 2 +- test/ruby/test_rubyoptions.rb | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d7508b9c..98eb284ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Oct 22 20:20:27 2009 Tanaka Akira + + * test/ruby/envutil.rb (assert_in_out_err): test_stdout and + test_stderr should be an array. + + * test/ruby/test_rubyoptions.rb (test_notfound): test_stdin of + assert_in_out_err should be a string. + Thu Oct 22 17:49:05 2009 Akinori MUSHA * lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 2fc614317..f0d5c2f8f 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -127,7 +127,7 @@ module Test end LANG_ENVS = %w"LANG LC_ALL LC_CTYPE" - def assert_in_out_err(args, test_stdin = "", test_stdout = "", test_stderr = "", message = nil) + def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil) in_c, in_p = IO.pipe out_p, out_c = IO.pipe err_p, err_c = IO.pipe diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 4e78b4c82..d4143cffb 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -317,7 +317,7 @@ class TestRubyOptions < Test::Unit::TestCase rubybin = Regexp.quote(EnvUtil.rubybin) pat = /\A#{rubybin}:.* -- #{Regexp.quote(notexist)} \(LoadError\)\Z/ assert_equal(false, File.exist?(notexist)) - assert_in_out_err(["-r", notexist, "-ep"], [], [], pat) - assert_in_out_err([notexist], [], [], pat) + assert_in_out_err(["-r", notexist, "-ep"], "", [], pat) + assert_in_out_err([notexist], "", [], pat) end end -- cgit