From ca5c3f1efc5636bdd83e018e50baffcbcdf75c86 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 8 Aug 2018 02:56:04 +0000 Subject: [PATCH] skip hanging-up tests on macOS git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/ruby/library/socket/basicsocket/send_spec.rb | 2 +- spec/ruby/library/socket/socket/accept_spec.rb | 2 +- spec/ruby/library/socket/socket/connect_spec.rb | 12 +++++++----- spec/ruby/library/socket/socket/sysaccept_spec.rb | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/spec/ruby/library/socket/basicsocket/send_spec.rb b/spec/ruby/library/socket/basicsocket/send_spec.rb index 1b1317a465..a405916bfc 100644 --- a/spec/ruby/library/socket/basicsocket/send_spec.rb +++ b/spec/ruby/library/socket/basicsocket/send_spec.rb @@ -177,7 +177,7 @@ describe 'BasicSocket#send' do end end - platform_is_not :windows do + platform_is_not :darwin, :windows do describe 'using a connected TCP socket' do before do @client = Socket.new(family, :STREAM) diff --git a/spec/ruby/library/socket/socket/accept_spec.rb b/spec/ruby/library/socket/socket/accept_spec.rb index 313062ee78..8b8978a55d 100644 --- a/spec/ruby/library/socket/socket/accept_spec.rb +++ b/spec/ruby/library/socket/socket/accept_spec.rb @@ -12,7 +12,7 @@ describe 'Socket#accept' do @server.close unless @server.closed? end - platform_is_not :freebsd, :windows do # hangs + platform_is_not :darwin, :freebsd, :windows do # hangs describe 'using an unbound socket' do it 'raises Errno::EINVAL' do lambda { @server.accept }.should raise_error(Errno::EINVAL) diff --git a/spec/ruby/library/socket/socket/connect_spec.rb b/spec/ruby/library/socket/socket/connect_spec.rb index 1e2982bfde..e26bf39cbb 100644 --- a/spec/ruby/library/socket/socket/connect_spec.rb +++ b/spec/ruby/library/socket/socket/connect_spec.rb @@ -37,11 +37,13 @@ describe 'Socket#connect' do }.should raise_error(Errno::EISCONN) end - it 'raises Errno::ECONNREFUSED or Errno::ETIMEDOUT when the connection failed' do - begin - @client.connect(@server.getsockname) - rescue => e - [Errno::ECONNREFUSED, Errno::ETIMEDOUT].include?(e.class).should == true + platform_is_not :darwin do + it 'raises Errno::ECONNREFUSED or Errno::ETIMEDOUT when the connection failed' do + begin + @client.connect(@server.getsockname) + rescue => e + [Errno::ECONNREFUSED, Errno::ETIMEDOUT].include?(e.class).should == true + end end end end diff --git a/spec/ruby/library/socket/socket/sysaccept_spec.rb b/spec/ruby/library/socket/socket/sysaccept_spec.rb index 9ad78e169e..14ff71639b 100644 --- a/spec/ruby/library/socket/socket/sysaccept_spec.rb +++ b/spec/ruby/library/socket/socket/sysaccept_spec.rb @@ -12,7 +12,7 @@ describe 'Socket#sysaccept' do @server.close end - platform_is_not :freebsd, :windows do # hangs + platform_is_not :freebsd, :windows, :darwin do # hangs describe 'using an unbound socket' do it 'raises Errno::EINVAL' do lambda { @server.sysaccept }.should raise_error(Errno::EINVAL)