https://git.ruby-lang.org/ruby.git/commit/?id=f9638c3b17

From f9638c3b1716df4a94ea6ae0854cf55d66072ee4 Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@r...>
Date: Mon, 15 Nov 2021 15:21:24 +0900
Subject: Revert "test/ruby/test_m17n.rb: Run a test under assert_separately"

This reverts commit a698181021c11711dc56b74dacbdebc2895b5384.

It failed on macos for a unknown problem.
```
    1) Error:
  TestM17N#test_object_inspect_external:
  Encoding::ConverterNotFoundError: code converter not found (US-ASCII to UTF-16BE)
      /Users/runner/work/ruby/ruby/src/test/ruby/test_m17n.rb:312:in `encode'
      /Users/runner/work/ruby/ruby/src/test/ruby/test_m17n.rb:312:in `inspect'
      /Users/runner/work/ruby/ruby/src/test/ruby/test_m17n.rb:315:in `inspect'
      /Users/runner/work/ruby/ruby/src/test/ruby/test_m17n.rb:315:in `<main>'
      /Users/runner/work/ruby/ruby/src/test/ruby/test_m17n.rb:299:in `test_object_inspect_external'
```
https://github.com/ruby/ruby/runs/4207871418?check_suite_focus=true
---
 test/ruby/test_m17n.rb | 52 ++++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb
index 9005c053814..6b0bc4de5ee 100644
--- a/test/ruby/test_m17n.rb
+++ b/test/ruby/test_m17n.rb
@@ -296,35 +296,37 @@ class TestM17N < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_m17n.rb#L296
   end
 
   def test_object_inspect_external
-    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
-    begin;
-      $VERBOSE = false
-      Encoding.default_internal = nil
-      o = Object.new
-
-      Encoding.default_external = Encoding::UTF_16BE
-      def o.inspect
-        "abc"
-      end
-      assert_nothing_raised(Encoding::CompatibilityError) { [o].inspect }
+    orig_v, $VERBOSE = $VERBOSE, false
+    orig_int, Encoding.default_internal = Encoding.default_internal, nil
+    orig_ext = Encoding.default_external
+    o = Object.new
+
+    Encoding.default_external = Encoding::UTF_16BE
+    def o.inspect
+      "abc"
+    end
+    assert_nothing_raised(Encoding::CompatibilityError) { [o].inspect }
 
-      def o.inspect
-        "abc".encode(Encoding.default_external)
-      end
+    def o.inspect
+      "abc".encode(Encoding.default_external)
+    end
 
-      assert_equal '[abc]', [o].inspect
+    assert_equal '[abc]', [o].inspect
 
-      Encoding.default_external = Encoding::US_ASCII
-      def o.inspect
-        "\u3042"
-      end
-      assert_equal '[\u3042]', [o].inspect
+    Encoding.default_external = Encoding::US_ASCII
+    def o.inspect
+      "\u3042"
+    end
+    assert_equal '[\u3042]', [o].inspect
 
-      def o.inspect
-        "\x82\xa0".force_encoding(Encoding::Windows_31J)
-      end
-      assert_equal '[\x{82A0}]', [o].inspect
-    end;
+    def o.inspect
+      "\x82\xa0".force_encoding(Encoding::Windows_31J)
+    end
+    assert_equal '[\x{82A0}]', [o].inspect
+  ensure
+    Encoding.default_internal = orig_int
+    Encoding.default_external = orig_ext
+    $VERBOSE = orig_v
   end
 
   def test_str_dump
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/