Merge lp:~lucio.torre/ubuntuone-client/add-upload-cancel into lp:ubuntuone-client

[Lucio Torre]

Adds cancel-upload before all uploads

Adds cancel-upload before one upload, so as to avoid the previous upload being removed from the queue but not cancelled.

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~lucio.torre/ubuntuone-client/add-upload-cancel]

819. By Lucio Torre on 2011-01-25

removed blank line

[Natalia Bidart (nataliabidart)]

Code looks good and all test passes. Approving with the promise of proper test suites as per bug #707586 :-)

review: Approve

=== modified file 'tests/syncdaemon/test_sync.py'
--- tests/syncdaemon/test_sync.py	2011-01-20 21:27:24 +0000
+++ tests/syncdaemon/test_sync.py	2011-01-25 18:32:13 +0000
@@ -340,7 +340,22 @@
         mdobj = self.fsm.get_by_mdid(mdid)
         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."""
+        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
+        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')
 
+        # 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, '')
+        
     def test_AQ_FILE_NEW_OK_with_md_in_none(self):
         """Created the file, and MD says it's in NONE."""
         # fake method

=== modified file 'ubuntuone/syncdaemon/sync.py'
--- ubuntuone/syncdaemon/sync.py	2011-01-14 14:58:19 +0000
+++ ubuntuone/syncdaemon/sync.py	2011-01-25 18:32:13 +0000
@@ -572,6 +572,9 @@
 
     def reput_file_from_local(self, event, params, hash):
         """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'])
+
         local_hash = self.key['local_hash']
         previous_hash = self.key['server_hash']
         crc32 = self.key['crc32']