jruby · Nov 21, 2015 · Nov 21, 2015
Showing with 35 additions and 2 deletions.

+1 −1 .travis.yml

+2 −1 Rakefile

+32 −0 src/test/ruby/ssl/test_ssl.rb
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ env:
   - TEST_PROFILE=test-1.7.4
   - TEST_PROFILE=test-1.7.13
   - TEST_PROFILE=test-1.7.18
-  - TEST_PROFILE=test-1.7.21 # NOTE 1.7.22 has load-path issues - loads built-in openssl
+  - TEST_PROFILE=test-1.7.22
   - TEST_PROFILE=test-9.0.1.0
   - TEST_PROFILE=test-9.0.4.0
 

diff --git a/Rakefile b/Rakefile
@@ -58,6 +58,7 @@ namespace :integration do
     end
     loader = "ARGV.each { |f| require f }"
     test_files = FileList['src/test/integration/*_test.rb'].to_a
-    ruby "-Ilib:. -e \"#{loader}\" #{test_files.map { |f| "\"#{f}\"" }.join(' ')}"
+    lib = [ 'lib' ]; lib << '.' if RUBY_VERSION > '2.2'
+    ruby "-I#{lib.join(':')} -e \"#{loader}\" #{test_files.map { |f| "\"#{f}\"" }.join(' ')}"
   end
 end
diff --git a/src/test/ruby/ssl/test_ssl.rb b/src/test/ruby/ssl/test_ssl.rb
@@ -121,4 +121,36 @@ def test_ssl_version_tlsv1_2
     end
   end unless java6? # TLS1_2 is not supported by JDK 6
 
+  def test_read_nonblock_would_block
+    start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
+      sock = TCPSocket.new("127.0.0.1", port)
+      ssl = OpenSSL::SSL::SSLSocket.new(sock)
+      ssl.connect
+
+      if defined? OpenSSL::SSL::SSLErrorWaitReadable
+        begin
+          ssl.read_nonblock(2)
+          fail 'read would block error not raised!'
+        rescue OpenSSL::SSL::SSLErrorWaitReadable => e
+          assert_equal 'read would block', e.message
+        end
+      else
+        begin
+          ssl.read_nonblock(2)
+          fail 'read would block error not raised!'
+        rescue => e
+          assert_equal 'read would block', e.message
+        end
+      end
+      if RUBY_VERSION > '2.2'
+        result = eval "ssl.read_nonblock(5, 'buff', exception: false)"
+        assert_equal :wait_readable, result
+      end
+      result = ssl.sysread_nonblock(5, :exception => false)
+      assert_equal :wait_readable, result
+
+      ssl.close
+    end
+  end
+
 end