Test for defunct (VERY BROKEN STILL)

Author: Nigel Small

neo4j/v1/connection.py

@@ -169,14 +169,6 @@ def chunk_reader(self):
                 data = self._recv(chunk_size)
                 yield data
 
-    def close(self):
-        """ Shut down and close the connection.
-        """
-        if __debug__: log_info("~~ [CLOSE]")
-        socket = self.socket
-        socket.shutdown(SHUT_RDWR)
-        socket.close()
-
 
 class Response(object):
     """ Subscriber object for a full response (zero or
@@ -200,10 +192,6 @@ def on_ignored(self, metadata=None):
         pass
 
 
-class Completable(object):
-    complete = False
-
-
 class Connection(object):
     """ Server connection through which all protocol messages
     are sent and received. This class is designed for protocol
@@ -217,6 +205,7 @@ def __init__(self, sock, **config):
         self.channel = ChunkChannel(sock)
         self.packer = Packer(self.channel)
         self.responses = deque()
+        self.closed = False
 
         # Determine the user agent and ensure it is a Unicode value
         user_agent = config.get("user_agent", DEFAULT_USER_AGENT)
@@ -234,6 +223,9 @@ def on_failure(metadata):
         while not response.complete:
             self.fetch_next()
 
+    def __del__(self):
+        self.close()
+
     def append(self, signature, fields=(), response=None):
         """ Add a message to the outgoing queue.
 
@@ -304,9 +296,13 @@ def fetch_next(self):
         raw.close()
 
     def close(self):
-        """ Shut down and close the connection.
+        """ Close the connection.
         """
-        self.channel.close()
+        if not self.closed:
+            if __debug__:
+                log_info("~~ [CLOSE]")
+            self.channel.socket.close()
+            self.closed = True
 
 
 def connect(host, port=None, **config):

neo4j/v1/session.py

@@ -107,7 +107,7 @@ def session(self):
         except IndexError:
             session = Session(self)
         else:
-            session.reset()
+            session.connection.reset()
         return session
 
 
@@ -347,19 +347,16 @@ def __init__(self, driver):
         self.closed = False
 
     def __del__(self):
-        self.connection.close()
+        if not self.closed:
+            self.connection.close()
+        self.closed = True
 
     def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
         self.close()
 
-    def reset(self):
-        """ Reset the connection so it can be reused from a clean state.
-        """
-        self.connection.reset()
-
     def run(self, statement, parameters=None):
         """ Run a parameterised Cypher statement.
 
@@ -414,7 +411,6 @@ def run(self, statement, parameters=None):
     def close(self):
         """ If still usable, return this session to the driver pool it came from.
         """
-        self.reset()
         if not self.connection.defunct:
             self.driver.sessions.appendleft(self)
         self.closed = True

test/test_session.py

@@ -21,6 +21,7 @@
 
 from unittest import TestCase
 
+from mock import patch
 from neo4j.v1.session import GraphDatabase, CypherError, Record, record
 from neo4j.v1.typesystem import Node, Relationship, Path
 from test.util import watch
@@ -223,14 +224,6 @@ def test_can_obtain_notification_info(self):
 
 class ResetTestCase(TestCase):
 
-    def test_explicit_reset(self):
-        with GraphDatabase.driver("bolt://localhost").session() as session:
-            result = session.run("RETURN 1")
-            assert result[0][0] == 1
-            session.reset()
-            result = session.run("RETURN 1")
-            assert result[0][0] == 1
-
     def test_automatic_reset_after_failure(self):
         with GraphDatabase.driver("bolt://localhost").session() as session:
             try:
@@ -241,6 +234,15 @@ def test_automatic_reset_after_failure(self):
             else:
                 assert False, "A Cypher error should have occurred"
 
+    @watch
+    def test_defunct(self):
+        from neo4j.v1.connection import ChunkChannel, ProtocolError
+        with GraphDatabase.driver("bolt://localhost").session() as session:
+            assert not session.connection.defunct
+            with patch.object(ChunkChannel, "chunk_reader", side_effect=ProtocolError()):
+                session.run("RETURN 1")
+            assert session.connection.defunct
+
 
 class RecordTestCase(TestCase):
     def test_record_equality(self):

test_requirements.txt

@@ -1,3 +1,4 @@
 behave
 coverage
+mock
 teamcity-messages