mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
da54a4589a
commit
4079c46912
3 changed files with 11 additions and 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>
|
Thu Oct 22 17:49:05 2009 Akinori MUSHA <knu@iDaemons.org>
|
||||||
|
|
||||||
* lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not
|
* lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not
|
||||||
|
|
|
@ -127,7 +127,7 @@ module Test
|
||||||
end
|
end
|
||||||
|
|
||||||
LANG_ENVS = %w"LANG LC_ALL LC_CTYPE"
|
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
|
in_c, in_p = IO.pipe
|
||||||
out_p, out_c = IO.pipe
|
out_p, out_c = IO.pipe
|
||||||
err_p, err_c = IO.pipe
|
err_p, err_c = IO.pipe
|
||||||
|
|
|
@ -317,7 +317,7 @@ class TestRubyOptions < Test::Unit::TestCase
|
||||||
rubybin = Regexp.quote(EnvUtil.rubybin)
|
rubybin = Regexp.quote(EnvUtil.rubybin)
|
||||||
pat = /\A#{rubybin}:.* -- #{Regexp.quote(notexist)} \(LoadError\)\Z/
|
pat = /\A#{rubybin}:.* -- #{Regexp.quote(notexist)} \(LoadError\)\Z/
|
||||||
assert_equal(false, File.exist?(notexist))
|
assert_equal(false, File.exist?(notexist))
|
||||||
assert_in_out_err(["-r", notexist, "-ep"], [], [], pat)
|
assert_in_out_err(["-r", notexist, "-ep"], "", [], pat)
|
||||||
assert_in_out_err([notexist], [], [], pat)
|
assert_in_out_err([notexist], "", [], pat)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue