Merge lp:~verterok/ubuntuone-client/fix-621924 into lp:ubuntuone-client

[Guillermo Gonzalez]

Fix dbus interface get_metadata methods to use the realpath.

Fix dbus interface get_metadata methods to use the realpath.

[Facundo Batista (facundo)]

Like it! Thanks!

review: Approve

[John Lenton (chipaca)]

oooh, nice :)

review: Approve

=== modified file 'tests/syncdaemon/test_dbus.py'
--- tests/syncdaemon/test_dbus.py	2010-08-25 17:45:11 +0000
+++ tests/syncdaemon/test_dbus.py	2010-08-31 18:11:48 +0000
@@ -233,6 +233,37 @@
                            error_handler=self.error_handler)
         return d
 
+    def test_get_metadata_path_symlink(self):
+        """Test the FileSystem Object, getting MD by path in a symlink."""
+        share_path = os.path.join(self.shares_dir, 'share')
+        self.main.vm.add_share(Share(path=share_path, volume_id='share'))
+        path = os.path.join(share_path, "foo")
+        symlink_path = os.path.join(self.shares_dir, "share_symlink")
+        share_context = self.main.fs._enable_share_write('share',
+                                                        share_path)
+        with share_context:
+            os.makedirs(share_path)
+            os.symlink(share_path, symlink_path)
+        self.fs_manager.create(path, "share")
+        self.fs_manager.set_node_id(path, "node_id")
+        d = defer.Deferred()
+        def handler(metadata):
+            """Reply handler."""
+            d.callback(metadata)
+
+        def callback(result):
+            """Callback to check the result."""
+            self.assertEquals(os.path.join(symlink_path, 'foo'), str(result['path']))
+            self.assertEquals('share', result['share_id'])
+            self.assertEquals('node_id', result['node_id'])
+
+        d.addCallback(callback)
+        client = DBusClient(self.bus, '/filesystem', DBUS_IFACE_FS_NAME)
+        client.call_method('get_metadata', os.path.join(symlink_path, 'foo'),
+                           reply_handler=handler,
+                           error_handler=self.error_handler)
+        return d
+
     def test_get_metadata_share_node(self):
         """Test the FileSystem Object, getting MD by share and node."""
         share_path = os.path.join(self.shares_dir, 'share')
@@ -558,6 +589,41 @@
                            error_handler=self.error_handler)
         return d
 
+    def test_get_metadata_and_quick_tree_synced_symlink(self):
+        """Test Status.get_metadata_and_quick_tree_status
+        without fake data in the AQ."""
+        share_path = os.path.join(self.shares_dir, 'share')
+        self.main.vm.add_share(Share(path=share_path, volume_id='share'))
+        path = os.path.join(share_path, u'ñoño'.encode('utf-8'))
+        self.fs_manager.create(path, "share")
+        self.fs_manager.set_node_id(path, "node_id")
+        symlink_path = os.path.join(self.shares_dir, "share_symlink")
+        share_context = self.main.fs._enable_share_write('share',
+                                                        share_path)
+        with share_context:
+            os.makedirs(share_path)
+            os.symlink(share_path, symlink_path)
+        expected_path = os.path.join(symlink_path, os.path.basename(path))
+
+        d = defer.Deferred()
+        def handler(metadata):
+            """Reply handler."""
+            d.callback(metadata)
+
+        def callback(result):
+            """Callback to check the result."""
+            self.assertEquals(expected_path, unicode(result['path']))
+            self.assertEquals('share', result['share_id'])
+            self.assertEquals('node_id', result['node_id'])
+            self.assertEquals('synced', result['quick_tree_synced'])
+
+        d.addCallback(callback)
+        client = DBusClient(self.bus, '/filesystem', DBUS_IFACE_FS_NAME)
+        client.call_method('get_metadata_and_quick_tree_synced',
+                           expected_path, reply_handler=handler,
+                           error_handler=self.error_handler)
+        return d
+
     def test_contq_changed(self):
         """Test the Status.ContentQueueChanged signal."""
         # prepare the VM so it lies for us

=== modified file 'ubuntuone/syncdaemon/dbus_interface.py'
--- ubuntuone/syncdaemon/dbus_interface.py	2010-08-25 13:59:42 +0000
+++ ubuntuone/syncdaemon/dbus_interface.py	2010-08-31 18:11:48 +0000
@@ -965,7 +965,8 @@
     def get_metadata(self, path):
         """Return the metadata (as a dict) for the specified path."""
         logger.debug('get_metadata by path: %r', path)
-        mdobj = self.fs_manager.get_by_path(path.encode('utf-8'))
+        real_path = os.path.realpath(path.encode('utf-8'))
+        mdobj = self.fs_manager.get_by_path(real_path)
         md_dict = self._mdobj_dict(mdobj)
         md_dict['path'] = path
         return md_dict
@@ -988,7 +989,8 @@
         the specified path, including the quick subtree status.
         """
         logger.debug('get_metadata_and_quick_tree_synced: %r', path)
-        mdobj = self.fs_manager.get_by_path(path.encode('utf-8'))
+        real_path = os.path.realpath(path.encode('utf-8'))
+        mdobj = self.fs_manager.get_by_path(real_path)
         md_dict = self._mdobj_dict(mdobj)
         md_dict['path'] = path
         if (self._path_in_queue(path, self.action_queue.meta_queue)