diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-22 11:22:11 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-22 11:22:11 +0000 |
commit | 4079c46912da9608dd5cc933d94a29baa99dd2e5 (patch) | |
tree | 310182f8a123b6d37649dec24badea6ac2a6eaee | |
parent | da54a4589af5cbe9a53f8baf3f9474c91e673b4c (diff) | |
download | ruby-4079c46912da9608dd5cc933d94a29baa99dd2e5.tar.gz |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@25435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | test/ruby/envutil.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_rubyoptions.rb | 4 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Thu Oct 22 20:20:27 2009 Tanaka Akira <akr@fsij.org> + + * 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 <knu@iDaemons.org> * 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 2fc6143176..f0d5c2f8f6 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 4e78b4c827..d4143cffb8 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 |