summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-21 05:52:25 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-21 05:52:25 +0000
commit0b8b3a8296e81db90cc29c2ac663b0e8e810c89b (patch)
tree5a7be5a7c4723db31181b88102f863ea9d667f1b
parenta9e98cf7d4bf7b551a5b88e0c687b2f58a2f5510 (diff)
merge revision(s) 53433: [Backport #12668]
test_ostruct.rb: sort method names * test/ostruct/test_ostruct.rb (test_accessor_defines_method): should not depend on the order of methods. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ostruct/test_ostruct.rb2
-rw-r--r--version.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb
index 02c4c74152..85fdd66ccd 100644
--- a/test/ostruct/test_ostruct.rb
+++ b/test/ostruct/test_ostruct.rb
@@ -170,7 +170,7 @@ class TC_OpenStruct < Test::Unit::TestCase
assert os.respond_to? :foo
assert_equal([], os.singleton_methods)
assert_equal(42, os.foo)
- assert_equal([:foo, :foo=], os.singleton_methods)
+ assert_equal([:foo, :foo=], os.singleton_methods.sort)
end
def test_does_not_redefine
diff --git a/version.h b/version.h
index cd3f657245..6bc65438a8 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.3.2"
-#define RUBY_RELEASE_DATE "2016-08-18"
-#define RUBY_PATCHLEVEL 173
+#define RUBY_RELEASE_DATE "2016-08-21"
+#define RUBY_PATCHLEVEL 174
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 21
#include "ruby/version.h"