diff options
| -rw-r--r-- | appveyor.yml | 4 | ||||
| -rw-r--r-- | test/excludes/TestThreadQueue.rb | 12 | ||||
| -rw-r--r-- | test/ruby/test_thread_queue.rb | 3 |
3 files changed, 5 insertions, 14 deletions
diff --git a/appveyor.yml b/appveyor.yml index 4503589899..6ff786684e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -93,8 +93,8 @@ for: - nmake -l "TESTOPTS=-v -q" btest - nmake -l "TESTOPTS=-v -q" test-basic - nmake -l "TESTOPTS=-q -j%JOBS% --subprocess-timeout-scale=1.5" test-all RUBY_FORCE_TEST_JIT=1 - # execute unstable tests separately without -j. - - nmake -l "TESTOPTS=-q --subprocess-timeout-scale=3.0" test-all TEST_EXCLUDES= TESTS="../test/win32ole/test_win32ole.rb ../test/ruby/test_thread_queue.rb" + # separately execute tests that may crash worker without -j. + - nmake -l "TESTOPTS=-q --subprocess-timeout-scale=1.5" test-all TEST_EXCLUDES= TESTS="../test/win32ole/test_win32ole.rb" - nmake -l test-spec - matrix: diff --git a/test/excludes/TestThreadQueue.rb b/test/excludes/TestThreadQueue.rb deleted file mode 100644 index 8e25cbeaaf..0000000000 --- a/test/excludes/TestThreadQueue.rb +++ /dev/null @@ -1,12 +0,0 @@ -if ENV['APPVEYOR'] == 'True' && RUBY_PLATFORM.match?(/mswin/) - exclude :test_queue_with_trap, 'too unstable on vs140' - # separately tested on appveyor.yml. -end - -# https://ci.appveyor.com/project/ruby/ruby/build/9795/job/l9t4w9ks7arsldb1 -# 1) Error: -# TestThreadQueue#test_queue_with_trap: -# Timeout::Error: execution of assert_in_out_err expired timeout (30.0 sec) -# pid 22988 exit 0 -# | -# C:/projects/ruby/test/ruby/test_thread_queue.rb:553:in `test_queue_with_trap' diff --git a/test/ruby/test_thread_queue.rb b/test/ruby/test_thread_queue.rb index 6ea37104c4..8cebbbecb4 100644 --- a/test/ruby/test_thread_queue.rb +++ b/test/ruby/test_thread_queue.rb @@ -550,6 +550,9 @@ class TestThreadQueue < Test::Unit::TestCase end def test_queue_with_trap + if ENV['APPVEYOR'] == 'True' && RUBY_PLATFORM.match?(/mswin/) + skip 'This test fails too often on AppVeyor vs140' + end assert_in_out_err([], <<-INPUT, %w(INT INT exit), []) q = Queue.new trap(:INT){ |