From 22acf29509f5cfc44a3dfa9d418bad13b29291da Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 30 Jul 2009 15:57:06 +0000 Subject: * test/ruby/test_module.rb (test_ancestors, test_included_modules): ignore rake mixins. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_module.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 4611abfbfb..c001c5507c 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -72,6 +72,12 @@ class TestModule < Test::Unit::TestCase list.reject {|c| c.to_s.start_with?("JSON") } end + def remove_rake_mixins(list) + list. + reject {|c| c.to_s == "RakeFileUtils" }. + reject {|c| c.to_s.start_with?("FileUtils") } + end + module Mixin MIXIN = 1 def mixin @@ -205,9 +211,9 @@ class TestModule < Test::Unit::TestCase assert_equal([Mixin], Mixin.ancestors) assert_equal([Object, Kernel, BasicObject], - remove_json_mixins(remove_pp_mixins(Object.ancestors))) + remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.ancestors)))) assert_equal([String, Comparable, Object, Kernel, BasicObject], - remove_json_mixins(remove_pp_mixins(String.ancestors))) + remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.ancestors)))) end def test_class_eval @@ -246,9 +252,9 @@ class TestModule < Test::Unit::TestCase assert_equal([], Mixin.included_modules) assert_equal([Mixin], User.included_modules) assert_equal([Kernel], - remove_json_mixins(remove_pp_mixins(Object.included_modules))) + remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.included_modules)))) assert_equal([Comparable, Kernel], - remove_json_mixins(remove_pp_mixins(String.included_modules))) + remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.included_modules)))) end def test_instance_methods -- cgit v1.2.3