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

From 24370a7a38db06a29637052a174c1fdc9c779a28 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Thu, 10 Jun 2021 16:08:40 +0900
Subject: merge revision(s) 370949aad60e992c26037241c07489c056554ea3:

	test/net/ftp/test_ftp.rb - fix intermittent MinGW failure

	Fixes intermittent error as below:

	[242/838] 5316=test_ftp
	#<Thread:0x0000020aa8733f20 D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:2532 run> terminated with exception (report_on_exception is true):
	D:/a/ruby/ruby/src/tool/lib/minitest/unit.rb:199:in `assert': Expected #<Errno::ECONNRESET: An existing connection was forcibly closed by the remote host.> to be nil. (MiniTest::Assertion)
		from D:/a/ruby/ruby/src/tool/lib/test/unit/core_assertions.rb:504:in `assert'
		from D:/a/ruby/ruby/src/tool/lib/minitest/unit.rb:299:in `assert_nil'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:430:in `ensure in block in test_list_read_timeout_exceeded'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:431:in `block in test_list_read_timeout_exceeded'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:2539:in `block in create_ftp_server'
	D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:426:in `write': An existing connection was forcibly closed by the remote host. (Errno::ECONNRESET)
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:426:in `print'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:426:in `block (2 levels) in test_list_read_timeout_exceeded'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:420:in `each'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:420:in `each_with_index'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:420:in `block in test_list_read_timeout_exceeded'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:2539:in `block in create_ftp_server'
	---
	 test/net/ftp/test_ftp.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)
---
 test/net/ftp/test_ftp.rb | 2 +-
 version.h                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
index 2978e55..b9cad21 100644
--- a/test/net/ftp/test_ftp.rb
+++ b/test/net/ftp/test_ftp.rb
@@ -425,7 +425,7 @@ class FTPTest < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/net/ftp/test_ftp.rb#L425
           end
           conn.print(l, "\r\n")
         end
-      rescue Errno::EPIPE
+      rescue Errno::EPIPE, Errno::ECONNRESET
       ensure
         assert_nil($!)
         conn.close
diff --git a/version.h b/version.h
index dc0da92..2688243 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 2
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 100
+#define RUBY_PATCHLEVEL 101
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 6
-- 
cgit v1.1


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