Merge lp:~mattia.barbon/txsymmetricjsonrpc/free-yajl-handle into lp:txsymmetricjsonrpc

[Mattia Barbon]

Free the YAJL parser handle when the connection is closed.
Cancel pending JSON-RPC calls when the connection is closed.
Call loseConnection() in test tearDown() method.

Unmerged revisions

5. By Mattia Barbon on 2011-05-24

Close the mocked connection at the end of each test.

4. By Mattia Barbon on 2011-05-24

Don't try to dispatch objects if there was a parse error.

3. By Mattia Barbon on 2011-05-24

Cancel pending JSON-RPC calls when closing the connection.

2. By Mattia Barbon on 2011-05-24

Free the JSON parser when closing the connection.

=== modified file 'txsymmetricjsonrpc/protocol.py'
--- txsymmetricjsonrpc/protocol.py	2011-05-19 10:03:52 +0000
+++ txsymmetricjsonrpc/protocol.py	2011-05-24 08:55:36 +0000
@@ -51,9 +51,20 @@
 
         self.stream = jsonr.Stream()
 
+    def connectionLost(self, reason):
+        if self.stream:
+            self.stream.close()
+            self.stream = None
+
+        protocol.Protocol.connectionLost(self, reason)
+
     def dataReceived(self, data):
         try:
             self.stream.addData(data)
+
+            # TODO maybe dispatch using a deferred
+            while self.stream.hasObject():
+                self._dispatch(self.stream.nextObject())
         except jsonr.ParseError:
             self.sendError(None, PARSE_ERROR, 'Parse error')
             self.transport.loseConnection()
@@ -61,10 +72,6 @@
             self.sendError(None, INTERNAL_ERROR, 'Internal error')
             self.transport.loseConnection()
 
-        # TODO maybe dispatch using a deferred
-        while self.stream.hasObject():
-            self._dispatch(self.stream.nextObject())
-
     def _dispatch(self, obj):
         if isinstance(obj, list):
             if len(obj) > 0:

=== modified file 'txsymmetricjsonrpc/proxy.py'
--- txsymmetricjsonrpc/proxy.py	2011-05-19 10:03:52 +0000
+++ txsymmetricjsonrpc/proxy.py	2011-05-24 08:55:36 +0000
@@ -58,6 +58,13 @@
 
         protocol.JsonRpcProtocol.makeConnection(self, transport)
 
+    def connectionLost(self, reason):
+        for d in self.pending.values():
+            d.cancel()
+        self.pending = {}
+
+        protocol.JsonRpcProtocol.connectionLost(self, reason)
+
     def jsonCallReceived(self, request_id, method, parameters):
         deferred = defer.Deferred()
         deferred.addCallback(lambda _: self._dispatchMethod(method, parameters))

=== modified file 'txsymmetricjsonrpc/test/test_proxy.py'
--- txsymmetricjsonrpc/test/test_proxy.py	2011-05-18 09:59:30 +0000
+++ txsymmetricjsonrpc/test/test_proxy.py	2011-05-24 08:55:36 +0000
@@ -63,6 +63,10 @@
         self.server = EchoServer()
         self.connection = utils.LoopbackConnection(self.client, self.server)
 
+    def tearDown(self):
+        self.client.transport.loseConnection()
+        self.server.transport.loseConnection()
+
     def assertFaultEquals(self, f1, f2):
         if f1.faultCode == f2.faultCode and f1.faultString == f2.faultString:
             return

=== modified file 'txsymmetricjsonrpc/test/test_v20.py'
--- txsymmetricjsonrpc/test/test_v20.py	2011-05-19 10:00:23 +0000
+++ txsymmetricjsonrpc/test/test_v20.py	2011-05-24 08:55:36 +0000
@@ -26,6 +26,10 @@
     def setUp(self):
         self.p = utils.mockProtocol()
 
+    def tearDown(self):
+        if not self.p.transport.disconnected:
+            self.p.transport.loseConnection()
+
 
 class CallTest(Base):
     def testRecv_withIdParams(self):

=== modified file 'txsymmetricjsonrpc/test/utils.py'
--- txsymmetricjsonrpc/test/utils.py	2011-05-18 17:51:46 +0000
+++ txsymmetricjsonrpc/test/utils.py	2011-05-24 08:55:36 +0000
@@ -24,9 +24,10 @@
 
 
 class MockTransport(object):
-    def __init__(self):
+    def __init__(self, protocol):
         self.data = []
         self.disconnected = False
+        self.protocol = protocol
 
     def write(self, data):
         # this assumes the implementation sends a message in a single write
@@ -34,14 +35,21 @@
 
     def loseConnection(self, reason=None):
         self.disconnected = True
-
+        self.protocol.connectionLost(reason)
+        del self.protocol
 
 class LoopbackTransport(object):
     def __init__(self, proto):
         self.proto = proto
 
     def write(self, data):
-        reactor.callLater(0, self.proto.dataReceived, data)
+        if self.proto:
+            reactor.callLater(0, self.proto.dataReceived, data)
+
+    def loseConnection(self, reason=None):
+        if self.proto:
+            self.proto.connectionLost(reason)
+            self.proto = None
 
 
 class LoopbackConnection(object):
@@ -77,6 +85,7 @@
 
 def mockProtocol():
     proto = MockProtocol()
-    proto.makeConnection(MockTransport())
+    transport = MockTransport(proto)
+    proto.makeConnection(transport)
 
     return proto