Merge lp:~jdobrien/ubuntuone-client/bugfix-553547 into lp:ubuntuone-client

[John O'Brien]

Fix a discrepancy between the client and protocol where share_deletion notifications are handled.

This branch makes the adjustments to the client so it is compatible with the storage protocol branch lp:ubuntuone-storage-protocol/split-share-change and must be tested with that revision.

[Rick McBride (rmcbride)]

review: Approve

[Eric Casteleijn (thisfred)]

Looks good, tests pass

review: Approve

=== modified file 'tests/syncdaemon/test_dbus.py'
--- tests/syncdaemon/test_dbus.py	2010-03-26 18:29:38 +0000
+++ tests/syncdaemon/test_dbus.py	2010-04-07 15:42:22 +0000
@@ -1176,7 +1176,7 @@
         match = self.bus.add_signal_receiver(share_handler,
                                      signal_name='ShareChanged')
         self.signal_receivers.add(match)
-        self.main.event_q.push('SV_SHARE_CHANGED', 'changed', info=share_holder)
+        self.main.event_q.push('SV_SHARE_CHANGED', share_holder)
         return d
 
     def test_share_deleted(self):
@@ -1217,7 +1217,7 @@
                                      signal_name='ShareDeleted')
         self.signal_receivers.add(match)
 
-        self.main.event_q.push('SV_SHARE_CHANGED', 'deleted', share_holder)
+        self.main.event_q.push('SV_SHARE_DELETED', share_holder.share_id)
         return d
 
     def test_share_created(self):
 
=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2010-03-31 21:48:44 +0000
+++ tests/syncdaemon/test_vm.py	2010-04-07 15:42:22 +0000
@@ -223,9 +223,9 @@
         share = Share(path=share_path, volume_id=str(share_holder.share_id),
                       access_level='View')
         self.vm.add_share(share)
-        self.vm.handle_SV_SHARE_CHANGED(message='changed', info=share_holder)
+        self.vm.handle_SV_SHARE_CHANGED(share_holder)
         self.assertEquals('Modify', self.vm.shares[str(share_id)].access_level)
-        self.vm.handle_SV_SHARE_CHANGED('deleted', share_holder)
+        self.vm.handle_SV_SHARE_DELETED(share_holder.share_id)
         self.assertNotIn('share_id', self.vm.shares)
 
     def test_persistence(self):
@@ -600,7 +600,7 @@
                                                      'test_username',
                                                      'visible', 'Modify')
         self.vm.handle_SYS_ROOT_RECEIVED('root_uuid')
-        self.vm.handle_SV_SHARE_CHANGED('changed', share_holder)
+        self.vm.handle_SV_SHARE_CHANGED(share_holder)
         shouldbe_dir = os.path.join(self.shares_dir,
                                     u"año".encode("utf8") + " from visible")
         self.assertEquals(shouldbe_dir, self.vm.shares['share_id'].path)
@@ -612,7 +612,7 @@
                                                      'test_username',
                                                      u'Ramón', 'Modify')
         self.vm.handle_SYS_ROOT_RECEIVED('root_uuid')
-        self.vm.handle_SV_SHARE_CHANGED('changed', share_holder)
+        self.vm.handle_SV_SHARE_CHANGED(share_holder)
         shouldbe_dir = os.path.join(self.shares_dir,
                                     "share from " + u"Ramón".encode("utf8"))
         self.assertEquals(shouldbe_dir, self.vm.shares['share_id'].path)
 
=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2010-04-05 14:51:51 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2010-04-07 15:42:22 +0000
@@ -715,12 +715,17 @@
         self.event_queue.push('SV_HASH_NEW',
                               share_id=share_id, node_id=node_id, hash=hash)
 
-    def _share_change_callback(self, message, info):
+    def _share_change_callback(self, info):
         """
         Called by the client when notified that a share changed.
         """
-        self.event_queue.push('SV_SHARE_CHANGED',
-                              message=message, info=info)
+        self.event_queue.push('SV_SHARE_CHANGED', info=info)
+
+    def _share_delete_callback(self, share_id):
+        """
+        Called by the client when notified that a share was deleted.
+        """
+        self.event_queue.push('SV_SHARE_DELETED', share_id=share_id)
 
     def _share_answer_callback(self, share_id, answer):
         """
 
=== modified file 'ubuntuone/syncdaemon/event_queue.py'
--- ubuntuone/syncdaemon/event_queue.py	2010-03-26 20:16:23 +0000
+++ ubuntuone/syncdaemon/event_queue.py	2010-04-07 15:42:22 +0000
@@ -80,7 +80,8 @@
                                    'public_url'),
     'AQ_CHANGE_PUBLIC_ACCESS_ERROR': ('share_id', 'node_id', 'error'),
 
-    'SV_SHARE_CHANGED': ('message', 'info'),
+    'SV_SHARE_CHANGED': ('info',),
+    'SV_SHARE_DELETED': ('share_id',),
     'SV_SHARE_ANSWERED': ('share_id', 'answer'),
     'SV_HASH_NEW': ('share_id', 'node_id', 'hash'),
     'SV_FILE_NEW': ('share_id', 'node_id', 'parent_id', 'name'),
 
=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2010-03-31 21:48:44 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2010-04-07 15:42:22 +0000
@@ -523,23 +523,24 @@
         # check AQ wait conditions
         self.m.action_q.check_conditions()
 
-    def handle_SV_SHARE_CHANGED(self, message, info):
+    def handle_SV_SHARE_CHANGED(self, share_info):
         """ handle SV_SHARE_CHANGED event """
-        if message == 'changed':
-            if str(info.share_id) not in self.shares:
-                self.log.debug("New share notification, share_id: %s",
-                         info.share_id)
-                dir_name = self._build_share_path(info.share_name,
-                                                  info.from_visible_name)
-                path = os.path.join(self.m.shares_dir, dir_name)
-                share = Share.from_notify_holder(info, path)
-                self.add_share(share)
-            else:
-                self.log.debug('share changed! %s', info.share_id)
-                self.share_changed(info)
-        elif message == 'deleted':
-            self.log.debug('share deleted! %s', info.share_id)
-            self.share_deleted(str(info.share_id))
+        if str(share_info.share_id) not in self.shares:
+            self.log.debug("New share notification, share_id: %s",
+                     share_info.share_id)
+            dir_name = self._build_share_path(share_info.share_name,
+                                              share_info.from_visible_name)
+            path = os.path.join(self.m.shares_dir, dir_name)
+            share = Share.from_notify_holder(share_info, path)
+            self.add_share(share)
+        else:
+            self.log.debug('share changed! %s', share_info.share_id)
+            self.share_changed(share_info)
+
+    def handle_SV_SHARE_DELETED(self, share_id):
+        """ handle SV_SHARE_DELETED event """
+        self.log.debug('share deleted! %s', share_id)
+        self.share_deleted(str(share_id))
 
     def handle_AQ_CREATE_SHARE_OK(self, share_id, marker):
         """ handle AQ_CREATE_SHARE_OK event. """
@@ -1493,5 +1494,3 @@
     def _pickle(self, value, fd, protocol):
         """Pickle value in fd using protocol."""
         cPickle.dump(value, fd, protocol=protocol)
-
-