akr	2009-10-22 20:22:11 +0900 (Thu, 22 Oct 2009)

  New Revision: 25435

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25435

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/envutil.rb
    trunk/test/ruby/test_rubyoptions.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25434)
+++ ChangeLog	(revision 25435)
@@ -1,3 +1,11 @@
+Thu Oct 22 20:20:27 2009  Tanaka Akira  <akr@f...>
+
+	* 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@i...>
 
 	* lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not
Index: test/ruby/envutil.rb
===================================================================
--- test/ruby/envutil.rb	(revision 25434)
+++ test/ruby/envutil.rb	(revision 25435)
@@ -127,7 +127,7 @@
       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
Index: test/ruby/test_rubyoptions.rb
===================================================================
--- test/ruby/test_rubyoptions.rb	(revision 25434)
+++ test/ruby/test_rubyoptions.rb	(revision 25435)
@@ -317,7 +317,7 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/