merge revision(s) 36641: [Backport #7295]

	* test/win32ole/test_win32ole_variant.rb: setting WIN32OLE.locale
	  to pass some assertion.  Thanks to Hiroshi Shirosaki.
	  [ruby-core:46873][Bug #6814]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 22 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index c6fe8f07a3..9ebe1baa16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  8 14:50:02 2012  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_variant.rb: setting WIN32OLE.locale
+	  to pass some assertion.  Thanks to Hiroshi Shirosaki.
+	  [ruby-core:46873][Bug #6814]
+
 Thu Nov  8 14:46:17 2012  Masaki Suketa <masaki.suketa@nifty.ne.jp>
 
 	* test/win32ole/test_win32ole.rb (test_s_codepage_changed):
diff --git a/test/win32ole/test_win32ole_variant.rb b/test/win32ole/test_win32ole_variant.rb
index 2b34d273e2..832d943d11 100644
--- a/test/win32ole/test_win32ole_variant.rb
+++ b/test/win32ole/test_win32ole_variant.rb
@@ -12,6 +12,14 @@ end
 if defined?(WIN32OLE_VARIANT)
 
   class TestWIN32OLE_VARIANT < Test::Unit::TestCase
+    def setup
+      @orglocale = WIN32OLE.locale
+      WIN32OLE.locale = 0x0409 # set locale  US-Eng
+    end
+
+    def teardown
+      WIN32OLE.locale = @orglocale
+    end
 
     def test_s_new
       obj = WIN32OLE_VARIANT.new('foo')
@@ -395,17 +403,13 @@ if defined?(WIN32OLE_VARIANT)
 
     def test_conversion_str2cy
       begin
-        begin
-          WIN32OLE.locale = 0x0411 # set locale Japanese
-        rescue WIN32OLERuntimeError
-          STDERR.puts("\n#{__FILE__}:#{__LINE__}:#{self.class.name}.test_conversion_str2cy is skipped(Japanese locale is not installed)")
-        end
-        if WIN32OLE.locale == 0x0411
-          obj = WIN32OLE_VARIANT.new("\\10,000", WIN32OLE::VARIANT::VT_CY)
-          assert_equal("10000", obj.value)
-        end
-      ensure
-        WIN32OLE.locale = WIN32OLE::LOCALE_SYSTEM_DEFAULT
+        WIN32OLE.locale = 0x0411 # set locale Japanese
+      rescue WIN32OLERuntimeError
+        skip("Japanese locale is not installed")
+      end
+      if WIN32OLE.locale == 0x0411
+        obj = WIN32OLE_VARIANT.new("\\10,000", WIN32OLE::VARIANT::VT_CY)
+        assert_equal("10000", obj.value)
       end
     end
 
diff --git a/version.h b/version.h
index 9a2bbb3eae..e979daa795 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 312
+#define RUBY_PATCHLEVEL 313
 
 #define RUBY_RELEASE_DATE "2012-11-08"
 #define RUBY_RELEASE_YEAR 2012