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

From 192aed9fa22c3043caedec6d0a12dce0371ddfd8 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Fri, 21 Oct 2022 22:47:16 +0900
Subject: merge revision(s) 49d59215506a30c8a11766627f7af0cdfe0de9d4:

	Fix Rinda test teardown for omitted tests

	New test failures on MINGW appeared after
	c2e37c8ff7da395f33fae546d9ae9e2408fc9236.

	      1) Error:
	    Rinda::TupleSpaceProxyTest#test_00_template:
	    NoMethodError: undefined method `stop_service' for nil:NilClass
	        D:/a/ruby/ruby/src/test/rinda/test_rinda.rb:516:in `teardown'

	      2) Error:
	    Rinda::TupleSpaceProxyTest#test_ruby_talk_264062:
	    NoMethodError: undefined method `stop_service' for nil:NilClass
	        D:/a/ruby/ruby/src/test/rinda/test_rinda.rb:516:in `teardown'

	Teardown happens even when the test is omitted.

	See: https://github.com/ruby/ruby/runs/7058984522
	---
	 test/rinda/test_rinda.rb | 4 ++++
	 1 file changed, 4 insertions(+)
---
 test/rinda/test_rinda.rb | 4 ++++
 version.h                | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 98b925c779..c23e452bdc 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -497,6 +497,7 @@ class TupleSpaceProxyTest < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/rinda/test_rinda.rb#L497
 
   def setup
     if RUBY_PLATFORM.match?(/mingw/) && ENV['MSYSTEM'] == 'UCRT64'
+      @omitted = true
       omit 'This test seems to randomly hang on GitHub Actions MinGW UCRT64'
     end
     super
@@ -506,6 +507,9 @@ class TupleSpaceProxyTest < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/rinda/test_rinda.rb#L507
     @server = DRb.start_service("druby://localhost:0")
   end
   def teardown
+    return if @omitted
+    @omitted = false
+
     # implementation-dependent
     @ts_base.instance_eval{
       if th = @keeper
diff --git a/version.h b/version.h
index ae3de25d25..5927aa1d8e 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 160
+#define RUBY_PATCHLEVEL 161
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-- 
cgit v1.2.3


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