diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-13 11:56:37 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-13 11:56:37 +0000 |
commit | e810c3e2a91851bf8756419d48442afaf9acfc9c (patch) | |
tree | 4edfe346b28be527b8d9b7021a0d14e50c31f795 /test | |
parent | cba6447e874feaadbfd5fd8a16973d8016def82d (diff) | |
download | ruby-e810c3e2a91851bf8756419d48442afaf9acfc9c.tar.gz ruby-e810c3e2a91851bf8756419d48442afaf9acfc9c.tar.xz ruby-e810c3e2a91851bf8756419d48442afaf9acfc9c.zip |
* test/ruby/envutil.rb (invoke_ruby): call to_str for stdin_data to
reject non-string.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/envutil.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_object.rb | 2 | ||||
-rw-r--r-- | test/test_mathn.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 0c3fbf9f5..f8ca78a52 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -83,7 +83,7 @@ module EnvUtil in_c.close out_c.close if capture_stdout err_c.close if capture_stderr - in_p.write stdin_data + in_p.write stdin_data.to_str in_p.close th_stdout = Thread.new { out_p.read } if capture_stdout th_stderr = Thread.new { err_p.read } if capture_stderr diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index ebc10fc65..8352b0397 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -399,7 +399,7 @@ class TestObject < Test::Unit::TestCase def test_superclass_method bug2312 = '[ruby-dev:39581]' assert_in_out_err(["-e", "module Enumerable;undef min;end; (1..2).min{}"], - [], [], /no superclass method/, bug2312) + "", [], /no superclass method/, bug2312) end def test_specific_eval_with_wrong_arguments diff --git a/test/test_mathn.rb b/test/test_mathn.rb index d0bf03760..708356852 100644 --- a/test/test_mathn.rb +++ b/test/test_mathn.rb @@ -4,7 +4,7 @@ require_relative 'ruby/envutil' # mathn redefines too much. It must be isolated to child processes. class TestMathn < Test::Unit::TestCase def test_power - assert_in_out_err ['-r', 'mathn', '-e', '1**2'], [], [], [], '[ruby-core:25740]' - assert_in_out_err ['-r', 'mathn', '-e', '(1<<126)**2'], [], [], [], '[ruby-core:25740]' + assert_in_out_err ['-r', 'mathn', '-e', '1**2'], "", [], [], '[ruby-core:25740]' + assert_in_out_err ['-r', 'mathn', '-e', '(1<<126)**2'], "", [], [], '[ruby-core:25740]' end end |