Defunct test working :-)

Author: technige

neo4j/v1/connection.py

@@ -262,19 +262,27 @@ def on_failure(metadata):
     def send(self):
         """ Send all queued messages to the server.
         """
+        if self.closed:
+            raise ProtocolError("Cannot write to a closed connection")
+        if self.defunct:
+            raise ProtocolError("Cannot write to a defunct connection")
         self.channel.send()
 
     def fetch_next(self):
         """ Receive exactly one message from the server.
         """
+        if self.closed:
+            raise ProtocolError("Cannot read from a closed connection")
+        if self.defunct:
+            raise ProtocolError("Cannot read from a defunct connection")
         raw = BytesIO()
         unpack = Unpacker(raw).unpack
         try:
             raw.writelines(self.channel.chunk_reader())
         except ProtocolError:
             self.defunct = True
             self.close()
-            return
+            raise
         # Unpack from the raw byte stream and call the relevant message handler(s)
         raw.seek(0)
         response = self.responses[0]

neokit

@@ -234,14 +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")
+                with self.assertRaises(ProtocolError):
+                    session.run("RETURN 1")
             assert session.connection.defunct
+            assert session.connection.closed
 
 
 class RecordTestCase(TestCase):

test/test_session.py

@@ -26,7 +26,8 @@
 
 def watch(f):
     """ Decorator to enable log watching for the lifetime of a function.
-    Useful for debugging unit tests.
+    Useful for debugging unit tests, simply add `@watch` to the top of
+    the test function.
 
     :param f: the function to decorate
     :return: a decorated function