Merge lp:~dobey/ubuntuone-client/update-3-0 into lp:ubuntuone-client/stable-3-0

[dobey]

Force a "reput from local" when the server_hash (that came in the delta) is ""

[Brian Curtin (brian.curtin)]

review: Approve

=== modified file 'tests/syncdaemon/test_sync.py'
--- tests/syncdaemon/test_sync.py	2012-04-09 20:07:05 +0000
+++ tests/syncdaemon/test_sync.py	2012-07-23 18:16:23 +0000
@@ -387,20 +387,29 @@
         self.sync._handle_SV_HASH_NEW(mdobj.share_id, mdobj.node_id, '')
         self.assertTrue(self.called)
 
-    def test_SV_HASH_NEW_with_file_uploadinterrupted_coverage(self):
-        """A SV_HASH_NEW is received after upload interrupted."""
+    def test_SV_HASH_NEW_with_special_hash(self):
+        """A SV_HASH_NEW is received with hash in None, don't care state."""
         self.called = False
 
-        # create a file and put it in local, without server_hash, as
-        # if the upload was cut in the middle after the make file
+        def fake_meth(_, event, params, hash):
+            """Wrap SSMR.reput_file_from_local to test."""
+            self.assertEqual(event, 'SV_HASH_NEW')
+            self.assertEqual(hash, '')
+            self.called = True
+        self.patch(SyncStateMachineRunner, 'reput_file_from_local', fake_meth)
+
+        # create a file and leave it as NONE state
         somepath = os.path.join(self.root, 'somepath')
         mdid = self.fsm.create(somepath, '', node_id='node_id')
-        self.fsm.set_by_mdid(mdid, local_hash='somehash', crc32='crc32',
-                             stat='stat', size='size')
+        self.fsm.set_by_mdid(mdid, local_hash='somehsh', server_hash='somehsh',
+                             crc32='crc32', stat='stat', size='size')
 
         # send the event with no content and check
         mdobj = self.fsm.get_by_mdid(mdid)
         self.sync._handle_SV_HASH_NEW(mdobj.share_id, mdobj.node_id, '')
+        self.assertTrue(self.called)
+        mdobj = self.fsm.get_by_mdid(mdid)
+        self.assertEqual(mdobj.server_hash, '')
 
     def test_AQ_FILE_NEW_OK_with_md_in_none(self):
         """Created the file, and MD says it's in NONE."""
@@ -991,7 +1000,6 @@
         with self._test_putcontent_upload_id(with_upload_id=False):
             self.ssmr.reput_file_from_local("SV_HASH_NEW", None, '')
 
-
     def test_commit_file_without_partial(self):
         """The .partial is lost when commiting the file."""
         # create the partial correctly, and break it!

=== modified file 'ubuntuone/syncdaemon/sync.py'
--- ubuntuone/syncdaemon/sync.py	2012-04-09 20:08:42 +0000
+++ ubuntuone/syncdaemon/sync.py	2012-07-23 18:16:23 +0000
@@ -589,10 +589,10 @@
         """Starts the scan again on a dir."""
         self.m.lr.scan_dir(self.key['mdid'], self.key['path'], udfmode)
 
-    def reput_file_from_local(self, event, params, hash):
+    def reput_file_from_local(self, event, params, hash_value):
         """Re put the file from its local state."""
         self.m.action_q.cancel_upload(share_id=self.key['share_id'],
-                            node_id=self.key['node_id'])
+                                      node_id=self.key['node_id'])
 
         local_hash = self.key['local_hash']
         previous_hash = self.key['server_hash']
@@ -841,7 +841,13 @@
         """on SV_HASH_NEW.  No longer called by EQ, only internally."""
         key = FSKey(self.m.fs, share_id=share_id, node_id=node_id)
         log = FileLogger(self.logger, key)
+
         ssmr = SyncStateMachineRunner(self.fsm, self.m, key, log)
+        if hash == "":
+            # Special case for hash == "", aka broken node.
+            # Set the server_hash = hash to force LOCAL state
+            key.set(server_hash=hash)
+            key.sync()
         ssmr.signal_event_with_hash("SV_HASH_NEW", hash)
 
     def _handle_SV_FILE_NEW(self, share_id, node_id, parent_id, name):