Commit f10b514d authored by Grégory Wisniewski's avatar Grégory Wisniewski

Fix indentation.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1847 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 9697881e
......@@ -147,8 +147,8 @@ class AdministrationHandler(MasterHandler):
app.broadcastNodesInformation(node_list)
# start nodes
for node in self.app.nm.getIdentifiedList(pool_set=uuid_set):
node.notify(Packets.NotifyLastOID(app.loid))
node.notify(Packets.StartOperation())
node.notify(Packets.NotifyLastOID(app.loid))
node.notify(Packets.StartOperation())
# broadcast the new partition table
app.broadcastPartitionChanges(cell_list)
p = Errors.Ack('node added')
......
......@@ -48,10 +48,10 @@ def _waitMessage(self, conn, msg_id, handler=None):
handler.dispatch(conn, conn.fakeReceived())
def resolving_tryToResolveConflict(oid, conflict_serial, serial, data):
return data
return data
def failing_tryToResolveConflict(oid, conflict_serial, serial, data):
return None
return None
class ClientApplicationTests(NeoTestBase):
......
......@@ -34,7 +34,7 @@ import neo
# Replace neo.setupLog by a no-op function.
# This will only impact instances created in this process, so client only.
def dummy_setupLog(*args, **kw):
pass
pass
real_setupLog = neo.setupLog
neo.setupLog = dummy_setupLog
# Import Storage only *after* patching neo.setupLog, as it keeps a direct
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment