From d059b9ec4df221da5e95d0c9eff2236ab83a4305 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 10 Jan 2024 16:18:57 +0900
Subject: [PATCH 1/3] Removed redundant block

---
 test/rubygems/helper.rb | 43 +++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index d259fbde1bc2..8638e0044495 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -105,39 +105,32 @@ def refute_directory_exists(path, msg = nil)
     refute File.directory?(path), msg
   end
 
-  # https://github.com/seattlerb/minitest/blob/21d9e804b63c619f602f3f4ece6c71b48974707a/lib/minitest/assertions.rb#L188
-  def _synchronize
-    yield
-  end
-
   # https://github.com/seattlerb/minitest/blob/21d9e804b63c619f602f3f4ece6c71b48974707a/lib/minitest/assertions.rb#L546
   def capture_subprocess_io
-    _synchronize do
-      require "tempfile"
+    require "tempfile"
 
-      captured_stdout = Tempfile.new("out")
-      captured_stderr = Tempfile.new("err")
+    captured_stdout = Tempfile.new("out")
+    captured_stderr = Tempfile.new("err")
 
-      orig_stdout = $stdout.dup
-      orig_stderr = $stderr.dup
-      $stdout.reopen captured_stdout
-      $stderr.reopen captured_stderr
+    orig_stdout = $stdout.dup
+    orig_stderr = $stderr.dup
+    $stdout.reopen captured_stdout
+    $stderr.reopen captured_stderr
 
-      yield
+    yield
 
-      $stdout.rewind
-      $stderr.rewind
+    $stdout.rewind
+    $stderr.rewind
 
-      return captured_stdout.read, captured_stderr.read
-    ensure
-      $stdout.reopen orig_stdout
-      $stderr.reopen orig_stderr
+    return captured_stdout.read, captured_stderr.read
+  ensure
+    $stdout.reopen orig_stdout
+    $stderr.reopen orig_stderr
 
-      orig_stdout.close
-      orig_stderr.close
-      captured_stdout.close!
-      captured_stderr.close!
-    end
+    orig_stdout.close
+    orig_stderr.close
+    captured_stdout.close!
+    captured_stderr.close!
   end
 
   ##

From 07ebc9f8445f92a938f0796821a0606ab2cdc542 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 10 Jan 2024 16:36:58 +0900
Subject: [PATCH 2/3] bin/rubocop -A test/rubygems/helper.rb

---
 test/rubygems/helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index 8638e0044495..86a496d85e62 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -122,7 +122,7 @@ def capture_subprocess_io
     $stdout.rewind
     $stderr.rewind
 
-    return captured_stdout.read, captured_stderr.read
+    [captured_stdout.read, captured_stderr.read]
   ensure
     $stdout.reopen orig_stdout
     $stderr.reopen orig_stderr

From 77b08054742c2b1b1c09001ece7799d95cd19072 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Thu, 11 Jan 2024 09:33:01 +0900
Subject: [PATCH 3/3] Update comment for minitest helper

---
 test/rubygems/helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index 86a496d85e62..e6774ded38f0 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -105,7 +105,7 @@ def refute_directory_exists(path, msg = nil)
     refute File.directory?(path), msg
   end
 
-  # https://github.com/seattlerb/minitest/blob/21d9e804b63c619f602f3f4ece6c71b48974707a/lib/minitest/assertions.rb#L546
+  # Originally copied from minitest/assertions.rb
   def capture_subprocess_io
     require "tempfile"