Merge lp:~facundo/ubuntuone-client/clean-aq-download-cancelled into lp:ubuntuone-client

[Facundo Batista]

Removed all traces of AQ_DOWNLOAD_CANCELLED. (LP: #721479)

Removed all traces of AQ_DOWNLOAD_CANCELLED.

It was just unused.

[Lucio Torre (lucio.torre)]

review: Approve

[Facundo Batista (facundo)]

Approving with one review

review: Approve

=== modified file 'tests/platform/linux/test_dbus.py'
--- tests/platform/linux/test_dbus.py	2011-03-02 16:55:26 +0000
+++ tests/platform/linux/test_dbus.py	2011-03-08 20:31:48 +0000
@@ -1698,26 +1698,6 @@
                                error='AN_ERROR')
         return d
 
-    def test_download_cancelled(self):
-        """Test the DBus signals in Status."""
-        a_dir = os.path.join(self.root_dir, u'ñoño'.encode('utf-8'))
-        self.fs_manager.create(a_dir, "", is_dir=False)
-        self.fs_manager.set_node_id(a_dir, "node_id")
-
-        d = defer.Deferred()
-        def download_handler(path, info):
-            """Handler for DownloadFinished signal."""
-            self.assertEquals(a_dir, path.encode('utf-8'))
-            self.assertEquals('CANCELLED', info['error'])
-            d.callback(True)
-
-        match = self.bus.add_signal_receiver(download_handler,
-                                     signal_name='DownloadFinished')
-        self.signal_receivers.add(match)
-        self.main.event_q.push('AQ_DOWNLOAD_CANCELLED', share_id='',
-                               node_id='node_id', server_hash='hash')
-        return d
-
     def test_upload_started(self):
         """Test the DBus signals in Status."""
         a_dir = os.path.join(self.root_dir, u'ñoño'.encode('utf-8'))

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2011-03-07 16:54:25 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2011-03-08 20:31:48 +0000
@@ -2225,12 +2225,7 @@
 
     def handle_failure(self, failure):
         """It didn't work! Push the event."""
-        if failure.check(protocol_errors.RequestCancelledError):
-            self.action_queue.event_queue.push('AQ_DOWNLOAD_CANCELLED',
-                                               share_id=self.share_id,
-                                               node_id=self.node_id,
-                                               server_hash=self.server_hash)
-        elif failure.check(protocol_errors.DoesNotExistError):
+        if failure.check(protocol_errors.DoesNotExistError):
             self.action_queue.event_queue.push('AQ_DOWNLOAD_DOES_NOT_EXIST',
                                                share_id=self.share_id,
                                                node_id=self.node_id)

=== modified file 'ubuntuone/syncdaemon/event_queue.py'
--- ubuntuone/syncdaemon/event_queue.py	2011-02-21 20:42:06 +0000
+++ ubuntuone/syncdaemon/event_queue.py	2011-03-08 20:31:48 +0000
@@ -51,7 +51,6 @@
     'AQ_DOWNLOAD_COMMIT': ('share_id', 'node_id', 'server_hash'),
     'AQ_DOWNLOAD_FINISHED': ('share_id', 'node_id', 'server_hash'),
     'AQ_DOWNLOAD_ERROR': ('share_id', 'node_id', 'server_hash', 'error'),
-    'AQ_DOWNLOAD_CANCELLED': ('share_id', 'node_id', 'server_hash'),
     'AQ_DOWNLOAD_DOES_NOT_EXIST': ('share_id', 'node_id'),
     'AQ_UPLOAD_STARTED' : ('share_id', 'node_id', 'hash'),
     'AQ_UPLOAD_FILE_PROGRESS': ('share_id', 'node_id',

=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2011-03-02 16:03:16 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2011-03-08 20:31:48 +0000
@@ -822,11 +822,6 @@
                         node_id=str(node_id))
             self.interface.status.emit_signal_error('DownloadFinished', args)
 
-    def handle_AQ_DOWNLOAD_CANCELLED(self, share_id, node_id, server_hash):
-        """Handle AQ_DOWNLOAD_CANCELLED."""
-        self.handle_AQ_DOWNLOAD_ERROR(share_id, node_id, server_hash,
-                                      'CANCELLED', 'AQ_DOWNLOAD_CANCELLED')
-
     def handle_AQ_DOWNLOAD_ERROR(self, share_id, node_id, server_hash, error,
                                  event='AQ_DOWNLOAD_ERROR'):
         """Handle AQ_DOWNLOAD_ERROR."""

=== modified file 'ubuntuone/syncdaemon/sync.py'
--- ubuntuone/syncdaemon/sync.py	2011-02-21 16:50:33 +0000
+++ ubuntuone/syncdaemon/sync.py	2011-03-08 20:31:48 +0000
@@ -873,13 +873,6 @@
         ssmr.signal_event_with_error_and_hash("AQ_DOWNLOAD_ERROR", error,
                                               server_hash)
 
-    def handle_AQ_DOWNLOAD_CANCELLED(self, share_id, node_id, server_hash):
-        """on AQ_DOWNLOAD_CANCELLED"""
-        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)
-        ssmr.signal_event_with_hash("AQ_DOWNLOAD_CANCELLED", server_hash)
-
     def handle_AQ_DOWNLOAD_DOES_NOT_EXIST(self, share_id, node_id):
         """on AQ_DOWNLOAD_DOES_NOT_EXIST."""
         key = FSKey(self.m.fs, share_id=share_id, node_id=node_id)

=== modified file 'ubuntuone/syncdaemon/u1fsfsm.ods'
Binary files ubuntuone/syncdaemon/u1fsfsm.ods	2010-09-07 20:49:38 +0000 and ubuntuone/syncdaemon/u1fsfsm.ods	2011-03-08 20:31:48 +0000 differ