No distinction is made when a client connection is lost, merge.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2068 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/storage/handlers/client.py

@@ -25,17 +25,8 @@ class ClientOperationHandler(BaseClientAndStorageOperationHandler):
     def _askObject(self, oid, serial, tid):
         return self.app.dm.getObject(oid, serial, tid)
 
-    def timeoutExpired(self, conn):
+    def connectionLost(self, conn, new_state):
         self.app.tm.abortFor(conn.getUUID())
-        BaseClientAndStorageOperationHandler.timeoutExpired(self, conn)
-
-    def connectionClosed(self, conn):
-        self.app.tm.abortFor(conn.getUUID())
-        BaseClientAndStorageOperationHandler.connectionClosed(self, conn)
-
-    def peerBroken(self, conn):
-        self.app.tm.abortFor(conn.getUUID())
-        BaseClientAndStorageOperationHandler.peerBroken(self, conn)
 
     def abortTransaction(self, conn, tid):
         self.app.tm.abort(tid)

neo/tests/storage/testClientHandler.py

@@ -65,19 +65,7 @@ class StorageClientHandlerTests(NeoTestBase):
         self.assertEqual(len(calls), 1)
         calls[0].checkArgs(uuid)
 
-    def test_connectionClosed(self):
-        uuid = self.getNewUUID()
-        conn = self._getConnection(uuid=uuid)
-        self.operation.connectionClosed(conn)
-        self._checkTransactionsAborted(uuid)
-
-    def test_timeoutExpired(self):
-        uuid = self.getNewUUID()
-        conn = self._getConnection(uuid=uuid)
-        self.operation.connectionClosed(conn)
-        self._checkTransactionsAborted(uuid)
-
-    def test_peerBroken(self):
+    def test_connectionLost(self):
         uuid = self.getNewUUID()
         conn = self._getConnection(uuid=uuid)
         self.operation.connectionClosed(conn)