From 0f078cbfc445cf079b2d3e3fb3eb0c85f9c2318b Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 22 Jan 2010 15:24:22 +0000
Subject: [PATCH] * test/ruby/test_dir.rb: get rid of debug print.

* test/ruby/test_module.rb: fixed to make test-all work.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                |  6 ++++++
 test/ruby/test_dir.rb    |  2 --
 test/ruby/test_module.rb | 10 +++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7936e055a1..b50a50f05b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jan 23 00:21:18 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_dir.rb: get rid of debug print.
+
+	* test/ruby/test_module.rb: fixed to make test-all work.
+
 Fri Jan 22 23:54:04 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* test/ruby/test_array.rb: add a test for Array#rotate, rotate!.
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index cabe38270e..a30a367243 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -208,9 +208,7 @@ class TestDir < Test::Unit::TestCase
     assert_equal([*?a..?z, *"symlink-a".."symlink-z"].each_slice(2).map {|f, _| File.join(@root, f + "/") }.sort,
 		 Dir.glob(File.join(@root, "*/")).sort)
 
-    puts("1");
     Dir.glob(File.join(@root, "**/"))
-    puts("2");
   end
 
 end
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 990fc017b5..f90543196b 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -385,20 +385,16 @@ class TestModule < Test::Unit::TestCase
     assert_equal([], Module.constants(false))
 
     src = <<-INPUT
+      ary = Module.constants
       module M
         WALTER = 99
       end
       class Module
         include M
       end
-      p Module.constants, Module.constants(true), Module.constants(false)
+      p Module.constants - ary, Module.constants(true), Module.constants(false)
     INPUT
-    assert_in_out_err([], src) do |out, err|
-      assert_equal([:BasicObject, :M], eval(out[0]).sort - Module.constants)
-      assert_equal("[:WALTER]", out[1])
-      assert_equal("[]", out[2])
-      assert_equal([], err)
-    end
+    assert_in_out_err([], src, %w([:M] [:WALTER] []), [])
   end
 
   module M1