Merge cec7f0a into 55125a6

lib/neo4j/core/cypher_session/adaptors/bolt.rb

@@ -185,7 +185,7 @@ def sendmsg(message)
             @socket.send(message, 0)
           end
 
-          def recvmsg(size, timeout = 10)
+          def recvmsg(size, timeout = timeout_option)
             Timeout.timeout(timeout) do
               @socket.recv(size).tap do |result|
                 log_message :S, result
@@ -228,6 +228,10 @@ def flush_response
             [].tap { |r| while arg = unpacker.unpack_value!; r << arg; end }
           end
 
+          def timeout_option
+            @options.fetch(:timeout) { 10 }
+          end
+
           # Represents messages sent to or received from the server
           class Message
             TYPE_CODES = {

spec/neo4j/core/cypher_session/adaptors/bolt_spec.rb

@@ -58,4 +58,20 @@
 
     it_behaves_like 'Neo4j::Core::CypherSession::Adaptor'
   end
+
+  describe 'timeouts' do
+    it 'defaults to 10' do
+      expect(Timeout).to receive(:timeout).with(10)
+      adaptor.send(:recvmsg, 1)
+    end
+
+    context 'when a timeout is configured' do
+      let(:adaptor) { adaptor_class.new(url, timeout: 20) }
+
+      it 'uses the configured timeout' do
+        expect(Timeout).to receive(:timeout).with(20)
+        adaptor.send(:recvmsg, 1)
+      end
+    end
+  end
 end