[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-sjoerd

Changes:

  Sjoerd Simons <sjoerd at luon.net>
    Add a test continously failing one node, causing group split and reconnects

  Sjoerd Simons <sjoerd at luon.net>
    causalorderingtest.py: Update the test to work the final protocol

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastTransport: Don't flag members as ATTEMPT_JOIN_DONE when the AJ packets had the current sender in the senders field

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: Let _cache_size only return the size of the relavant cached items

  Sjoerd Simons <sjoerd at luon.net>
    repair-after-node-disconnected-test.py: After successfull finishing,  send a packet from the retriever and wait 30 seconds after success so everyone can dispose node0

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastTransport: Updated members can start the packet after the one we just processed

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: After popping a data packat, exit the pop_packet function the normal way, to ensure the progress timer is properly reset

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: Only do the failure process on the wire for nodes of which we known the start, otherwise mark them as instant failures

  Sjoerd Simons <sjoerd at luon.net>
    Cleanup join failure timer when the join has succeeded

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastTransport: When a node fails during a join let the join process take care of the removal from members

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: Keep a sender in a pending removal state as long as not all it's depends are acked

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastTransport: Check join state directly after starting it, in case we're the only one left

  Sjoerd Simons <sjoerd at luon.net>
    Whitespace fixes

  Sjoerd Simons <sjoerd at luon.net>
    Explain gibber_r_multicast_packet_diff a bit more

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: Only stop repeating if requested

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: Ensure sender dispose methods don't iterate the groups hash array while it's being freed

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: While popping packets keep checking the senders state

  Sjoerd Simons <sjoerd at luon.net>
    After connecting the GibberRMTransport, no longer listen to GibberRMCTransport signals. Those belong to GibberRMTransport now

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: When marking nodes as instant failure remove their respective senders from the causal transport

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: Some whitespace fixes

  Sjoerd Simons <sjoerd at luon.net>
    mesh.py: Add some utility functions to dump depends and get the packets sender

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: Don't let lookup_by_name care about nodes pending for removal

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: When signalling failure only cancel the needed timers don't set the state to failure

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastTransport: Assert that we are not asked to connected in the connected state

  Sjoerd Simons <sjoerd at luon.net>
    GibberRMulticastSender: Do a stricter check of a senders state before signalling failure