Merge lp:~lucio.torre/ubuntuone-client/dont-reorder-deletes into lp:ubuntuone-client

[Lucio Torre]

make sure we dont reorder deletes

make sure we dont reorder deletes
with this change the conflict is avoided and integration tests pass
i dont know why this was done this way the first time.

[lp:~lucio.torre/ubuntuone-client/dont-reorder-deletes]

718. By Lucio Torre on 2010-09-22

added docs to test

[John O'Brien (jdobrien)]

go go go!

review: Approve

[Guillermo Gonzalez (verterok)]

looks good, tests pass.

review: Approve

=== modified file 'tests/syncdaemon/test_sync.py'
--- tests/syncdaemon/test_sync.py	2010-09-15 19:02:52 +0000
+++ tests/syncdaemon/test_sync.py	2010-09-22 18:03:44 +0000
@@ -1349,7 +1349,12 @@
         self.handler.records = []
 
     def test_handle_deletes_last(self):
-        """The handler for SV_FILE_DELETED is called last"""
+        """The handler for SV_FILE_DELETED is not called last
+
+        If we reorder deletes we will get a fake conflict when a
+        delete and move that overwrites the deleted file arrives.
+        """
+
         self.create_filetxt()
         self.create_dir()
 
@@ -1373,7 +1378,7 @@
         self.sync.handle_AQ_DELTA_OK(**kwargs)
 
         # check that the handlers are called in order
-        self.assertEqual(called, ['hash', 'delete'])
+        self.assertEqual(called, ['delete', 'hash'])
 
     def test_exception_mark_node_as_dirty(self):
         """We mark the node as dirty and send an event on error."""

=== modified file 'ubuntuone/syncdaemon/sync.py'
--- ubuntuone/syncdaemon/sync.py	2010-09-15 19:02:52 +0000
+++ ubuntuone/syncdaemon/sync.py	2010-09-22 18:03:44 +0000
@@ -1077,6 +1077,7 @@
                 # about it
                 if not dt.is_live:
                     to_delete.append(dt)
+                    self._handle_SV_FILE_DELETED(dt.share_id, dt.node_id)
                     # nothing else should happen with this
                     continue
 
@@ -1146,15 +1147,6 @@
                     "Node delta for %s:%s can't be applied.",
                     dt.share_id, dt.node_id)
 
-        for dt in to_delete:
-            try:
-                # delete all the nodes after applying all deltas
-                self._handle_SV_FILE_DELETED(dt.share_id, dt.node_id)
-            except Exception:
-                self.logger.exception(
-                    "Node delete for %s:%s can't be applied.",
-                    dt.share_id, dt.node_id)
-
                 # And mark the node as dirty
                 self.mark_node_as_dirty(dt.share_id, dt.node_id)