From 3b8b66880623fd7dbf3104c4702d21b93b45fd3a Mon Sep 17 00:00:00 2001 From: normal Date: Wed, 8 Aug 2018 01:16:37 +0000 Subject: [PATCH] spec/ruby/library/socket/*: fix hanging on FreeBSD 11.1 There are still other test failures which need fixing on FreeBSD. Keep an eye on: http://rubyci.s3.amazonaws.com/freebsd11zfs/ruby-trunk/recent.html git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/ruby/library/socket/basicsocket/send_spec.rb | 4 ++++ spec/ruby/library/socket/socket/accept_spec.rb | 2 +- spec/ruby/library/socket/socket/sysaccept_spec.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spec/ruby/library/socket/basicsocket/send_spec.rb b/spec/ruby/library/socket/basicsocket/send_spec.rb index c8d2af8f7a..1b1317a465 100644 --- a/spec/ruby/library/socket/basicsocket/send_spec.rb +++ b/spec/ruby/library/socket/basicsocket/send_spec.rb @@ -200,6 +200,10 @@ describe 'BasicSocket#send' do @client.send('a', Socket::MSG_OOB).should == 1 + platform_is :freebsd do # recv hangs otherwise + @client.close + end + socket, _ = @server.accept begin socket.recv(1, Socket::MSG_OOB).should == 'a' diff --git a/spec/ruby/library/socket/socket/accept_spec.rb b/spec/ruby/library/socket/socket/accept_spec.rb index 2c71d435ac..313062ee78 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 :windows do # hangs + platform_is_not :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/sysaccept_spec.rb b/spec/ruby/library/socket/socket/sysaccept_spec.rb index 17b1a8a2f0..9ad78e169e 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 :windows do # hangs + platform_is_not :freebsd, :windows do # hangs describe 'using an unbound socket' do it 'raises Errno::EINVAL' do lambda { @server.sysaccept }.should raise_error(Errno::EINVAL)