aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2019-08-06 00:43:46 +0900
committerTakashi Kokubun <takashikkbn@gmail.com>2019-08-06 00:48:00 +0900
commite80f407ed4eafad4c544d7b2de507a0f4386f0a7 (patch)
tree1dc8b477c022b88e35b4fc9e8fdceb92d37c8470
parent48d460d9a6d326f4084dec0fd5d90b1cc4331e78 (diff)
downloadruby-e80f407ed4eafad4c544d7b2de507a0f4386f0a7.tar.gz
Give up stabilizing TestProcess on Travis osx
They have been too unstable. Revert "Extend sleep before sending USR1 in TestProcess" This reverts commit aaf69a8ba866193863a7eafe5c6044844bd71bc3. Revert "Extend sleep before sending USR1 in TestProcess" This reverts commit 076f3fcf11a061394d3d5f8c671512df1e983023.
-rw-r--r--test/excludes/_travis/osx/TestProcess.rb7
-rw-r--r--test/ruby/test_process.rb4
2 files changed, 9 insertions, 2 deletions
diff --git a/test/excludes/_travis/osx/TestProcess.rb b/test/excludes/_travis/osx/TestProcess.rb
new file mode 100644
index 0000000000..5aa03d5ead
--- /dev/null
+++ b/test/excludes/_travis/osx/TestProcess.rb
@@ -0,0 +1,7 @@
+# These tests randomly hang forever. For testing other things properly, skipped for now.
+
+# https://travis-ci.org/ruby/ruby/jobs/566409880
+exclude(:test_execopts_redirect_open_fifo_interrupt_raise, 'This test randomly hangs on Travis osx')
+
+# https://travis-ci.org/ruby/ruby/jobs/567547060
+exclude(:test_execopts_redirect_open_fifo_interrupt_print, 'This test randomly hangs on Travis osx')
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 1d20c11ecc..83c9c6a867 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -665,7 +665,7 @@ class TestProcess < Test::Unit::TestCase
end
EOS
assert_equal("start\n", io.gets)
- sleep 3
+ sleep 0.5
Process.kill(:USR1, io.pid)
assert_equal("ok\n", io.read)
}
@@ -686,7 +686,7 @@ class TestProcess < Test::Unit::TestCase
system("cat", :in => "fifo")
EOS
assert_equal("start\n", io.gets)
- sleep 3 # wait for the child to stop at opening "fifo"
+ sleep 0.2 # wait for the child to stop at opening "fifo"
Process.kill(:USR1, io.pid)
assert_equal("trap\n", io.readpartial(8))
File.write("fifo", "ok\n")