summaryrefslogtreecommitdiff
path: root/test/ruby
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-13 11:56:37 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-13 11:56:37 +0000
commit71ab182911602baa7facb1ffc71146ce8d376938 (patch)
tree4edfe346b28be527b8d9b7021a0d14e50c31f795 /test/ruby
parent77088d667223ceb5b964324300d8c9a979ac8076 (diff)
* test/ruby/envutil.rb (invoke_ruby): call to_str for stdin_data to
reject non-string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r--test/ruby/envutil.rb2
-rw-r--r--test/ruby/test_object.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 0c3fbf9f55..f8ca78a524 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 ebc10fc650..8352b03979 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