summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-20 01:28:43 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-20 01:28:43 +0000
commit5187ea768f57315e61486122d688f1992d4cb21f (patch)
tree777be0bae5c4a7e07200d08bc0c6279ceb7fe0aa
parentd7d0ee10653afad2ace63cbf557eb0204097e1d7 (diff)
test_thread.rb: skip test_thread.rb broken for Windows
msys2. https://ci.appveyor.com/project/ruby/ruby/builds/20419607/job/fuvrfcmrhxr1r1cr https://ci.appveyor.com/project/ruby/ruby/builds/20395349/job/2nqewb06b5eanwea https://ci.appveyor.com/project/ruby/ruby/builds/20382452/job/658pvl1cqolyrixm git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--bootstraptest/pending.rb8
-rw-r--r--bootstraptest/test_thread.rb6
2 files changed, 8 insertions, 6 deletions
diff --git a/bootstraptest/pending.rb b/bootstraptest/pending.rb
index 744c0ad..fa4e04c 100644
--- a/bootstraptest/pending.rb
+++ b/bootstraptest/pending.rb
@@ -37,3 +37,11 @@ assert_normal_exit %q{
r.instance_eval { initialize r, r }
r.inspect
}
+
+# This test randomly fails on AppVeyor msys2 with:
+# test_thread.rb: A non-blocking socket operation could not be completed immediately. - read would block
+assert_finish 3, %{
+ th = Thread.new {sleep 0.2}
+ th.join(0.1)
+ th.join
+}
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index d16295d..2b549b9 100644
--- a/bootstraptest/test_thread.rb
+++ b/bootstraptest/test_thread.rb
@@ -249,12 +249,6 @@ assert_equal 'ok', %{
}
assert_finish 3, %{
- th = Thread.new {sleep 0.2}
- th.join(0.1)
- th.join
-}
-
-assert_finish 3, %{
require 'timeout'
th = Thread.new {sleep 0.2}
begin