From 9899e669edac9aef3dcaadba17a738f1178354d8 Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 13 Sep 2019 11:17:07 +0000 Subject: merge revision(s) b0b0ded5aa2cf7c4574b057d8326ed4e1c172c12: webrick/test_utils.rb: loosen timeout severity to stabilize CI failure like: https://rubyci.org/logs/rubyci.s3.amazonaws.com/osx1013/ruby-trunk/log/20181228T114501Z.fail.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/webrick/test_utils.rb | 6 +++--- version.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/webrick/test_utils.rb b/test/webrick/test_utils.rb index 8907789b6e..c2b7a36e8a 100644 --- a/test/webrick/test_utils.rb +++ b/test/webrick/test_utils.rb @@ -32,11 +32,11 @@ class TestWEBrickUtils < Test::Unit::TestCase m = WEBrick::Utils i = 0 assert_raise(Timeout::Error){ - m.timeout(0.2){ - assert_raise(Timeout::Error){ m.timeout(0.1){ i += 1; sleep } } + m.timeout(1){ + assert_raise(Timeout::Error){ m.timeout(0.1){ i += 1; sleep(1) } } assert_not_expired(m) i += 1 - sleep + sleep(2) } } assert_equal(2, i) diff --git a/version.h b/version.h index d6fd8490be..8e8ea7e151 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.6.5" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 105 +#define RUBY_PATCHLEVEL 106 #define RUBY_RELEASE_YEAR 2019 -#define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_MONTH 9 +#define RUBY_RELEASE_DAY 13 #include "ruby/version.h" -- cgit v1.2.3