diff options
| author | Yusuke Endoh <mame@ruby-lang.org> | 2019-09-02 22:30:12 +0900 |
|---|---|---|
| committer | Yusuke Endoh <mame@ruby-lang.org> | 2019-09-02 22:33:27 +0900 |
| commit | 53a7abe2cd6bd07b816a7a7e2235befd5e1b4446 (patch) | |
| tree | a6b60581f9f7b385b45be3cac8014828757dbea2 /test/drb | |
| parent | 8b2e1ca10ecf92ad402decd6b1eab586eded0ddb (diff) | |
| download | ruby-53a7abe2cd6bd07b816a7a7e2235befd5e1b4446.tar.gz | |
test/drb/drbtest.rb: Skip test_06_timeout on Solaris10s
The test seems to have a race condition, which fails on very slow
machine like Solaris10s. So skip it.
In addition, this change restores timeout guard that was removed at
0660d7cb538cf5284d50f66adfcbd78609839715. This is because the test gets
stuck forever when something wrong occurs. It is better to fail the
test than stuck.
Diffstat (limited to 'test/drb')
| -rw-r--r-- | test/drb/drbtest.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb index d764bc75db..9ac3e08cdf 100644 --- a/test/drb/drbtest.rb +++ b/test/drb/drbtest.rb @@ -207,12 +207,15 @@ module DRbCore def test_06_timeout skip if RUBY_PLATFORM.include?("armv7l-linux") - ten = Onecky.new(10) - assert_raise(Timeout::Error) do - @there.do_timeout(ten) - end - assert_raise(Timeout::Error) do - @there.do_timeout(ten) + skip if RUBY_PLATFORM.include?("sparc-solaris2.10") + Timeout.timeout(60) do + ten = Onecky.new(10) + assert_raise(Timeout::Error) do + @there.do_timeout(ten) + end + assert_raise(Timeout::Error) do + @there.do_timeout(ten) + end end end |