aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_module.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 100b0afcb5..eb8fea14c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 3 02:29:25 2015 Benoit Daloze <eregontp@gmail.com>
+
+ * test/ruby/test_module.rb: Do not assume class variable order.
+ Path by @enebo.
+
Wed Jun 3 01:10:38 2015 Yusuke Endoh <mame@tsg.ne.jp>
* vm_method.c (rb_method_definition_set): remove a double assignment.
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 8bfdf8db35..bdf699536d 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -1768,8 +1768,8 @@ class TestModule < Test::Unit::TestCase
m2.send(:include, m)
m2.class_variable_set(:@@bar, 2)
assert_equal([:@@foo], m.class_variables)
- assert_equal([:@@bar, :@@foo], m2.class_variables)
- assert_equal([:@@bar, :@@foo], m2.class_variables(true))
+ assert_equal([:@@bar, :@@foo], m2.class_variables.sort)
+ assert_equal([:@@bar, :@@foo], m2.class_variables(true).sort)
assert_equal([:@@bar], m2.class_variables(false))
end