[Neo-report] r1859 vincent - in /trunk/neo: client/ tests/client/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Feb 25 14:52:56 CET 2010
Author: vincent
Date: Thu Feb 25 14:52:55 2010
New Revision: 1859
Log:
Remove unused parameter.
Store does not handle conflicts (for reliability, it can only be done once
all store responses are received), so this parameter must go away.
Modified:
trunk/neo/client/Storage.py
trunk/neo/client/app.py
trunk/neo/tests/client/testClientApp.py
Modified: trunk/neo/client/Storage.py
==============================================================================
--- trunk/neo/client/Storage.py [iso-8859-1] (original)
+++ trunk/neo/client/Storage.py [iso-8859-1] Thu Feb 25 14:52:55 2010
@@ -69,8 +69,7 @@
@check_read_only
def store(self, oid, serial, data, version, transaction):
return self.app.store(oid=oid, serial=serial,
- data=data, version=version, transaction=transaction,
- tryToResolveConflict=self.tryToResolveConflict)
+ data=data, version=version, transaction=transaction)
def getSerial(self, oid):
try:
Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Thu Feb 25 14:52:55 2010
@@ -544,8 +544,7 @@
self.local_var.txn = transaction
- def store(self, oid, serial, data, version, transaction,
- tryToResolveConflict):
+ def store(self, oid, serial, data, version, transaction):
"""Store object."""
if transaction is not self.local_var.txn:
raise StorageTransactionError(self, transaction)
@@ -608,7 +607,7 @@
del local_var.conflict_serial_dict[oid]
# Try to store again
self.store(oid, conflict_serial, new_data, version,
- local_var.txn, tryToResolveConflict)
+ local_var.txn)
append(oid)
resolved = True
if not resolved:
@@ -820,8 +819,7 @@
# Third do transaction with old data
for oid, data in data_dict.iteritems():
- self.store(oid, transaction_id, data, None, txn,
- tryToResolveConflict)
+ self.store(oid, transaction_id, data, None, txn)
self.waitStoreResponses(tryToResolveConflict)
return self.local_var.tid, oid_list
Modified: trunk/neo/tests/client/testClientApp.py
==============================================================================
--- trunk/neo/tests/client/testClientApp.py [iso-8859-1] (original)
+++ trunk/neo/tests/client/testClientApp.py [iso-8859-1] Thu Feb 25 14:52:55 2010
@@ -412,7 +412,7 @@
app.local_var.txn = old_txn = object()
self.assertTrue(app.local_var.txn is not txn)
self.assertRaises(StorageTransactionError, app.store, oid, tid, '',
- None, txn, resolving_tryToResolveConflict)
+ None, txn)
self.assertEquals(app.local_var.txn, old_txn)
# check partition_id and an empty cell list -> NEOStorageError
app.local_var.txn = txn
@@ -420,7 +420,7 @@
app.pt = Mock({ 'getCellListForOID': (), })
app.num_partitions = 2
self.assertRaises(NEOStorageError, app.store, oid, tid, '', None,
- txn, resolving_tryToResolveConflict)
+ txn)
calls = app.pt.mockGetNamedCalls('getCellListForOID')
self.assertEquals(len(calls), 1)
self.assertEquals(calls[0].getParam(0), oid) # oid=11
@@ -453,7 +453,7 @@
app.nm.createStorage(address=storage_address)
app.local_var.object_stored = (oid, tid)
app.local_var.data_dict[oid] = 'BEFORE'
- app.store(oid, tid, '', None, txn, failing_tryToResolveConflict)
+ app.store(oid, tid, '', None, txn)
app.local_var.queue.put((conn, packet))
self.assertRaises(ConflictError, app.waitStoreResponses,
failing_tryToResolveConflict)
@@ -488,7 +488,7 @@
return not queue.empty()
app.dispatcher = Dispatcher()
app.nm.createStorage(address=storage_address)
- app.store(oid, tid, 'DATA', None, txn, resolving_tryToResolveConflict)
+ app.store(oid, tid, 'DATA', None, txn)
self.checkAskStoreObject(conn)
app.local_var.queue.put((conn, packet))
app.waitStoreResponses(resolving_tryToResolveConflict)
More information about the Neo-report
mailing list