[Neo-report] r2068 gregory - in /trunk/neo: storage/handlers/ tests/storage/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed May 5 18:47:49 CEST 2010
Author: gregory
Date: Wed May 5 18:47:49 2010
New Revision: 2068
Log:
No distinction is made when a client connection is lost, merge.
Modified:
trunk/neo/storage/handlers/client.py
trunk/neo/tests/storage/testClientHandler.py
Modified: trunk/neo/storage/handlers/client.py
==============================================================================
--- trunk/neo/storage/handlers/client.py [iso-8859-1] (original)
+++ trunk/neo/storage/handlers/client.py [iso-8859-1] Wed May 5 18:47:49 2010
@@ -25,17 +25,8 @@
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)
Modified: trunk/neo/tests/storage/testClientHandler.py
==============================================================================
--- trunk/neo/tests/storage/testClientHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testClientHandler.py [iso-8859-1] Wed May 5 18:47:49 2010
@@ -65,19 +65,7 @@
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)
More information about the Neo-report
mailing list