Merge lp:~nataliabidart/ubuntuone-control-panel/use-new-syncademon-get-udf-fict into lp:ubuntuone-control-panel

[Natalia Bidart]

Fixing tests according to latests changes to syncdaemon.

[Manuel de la Peña (mandel)]

The get_udf_dict and get_share_dict have been moved to ubuntuone.syncdaemon.interaction_interfaces because they where common methods that where part of the dbus/ipc interface. The reason for them to be moved is due to the fact that the same dict is wanted in any platform, which explains why the tests broke... oh that evil _ ;)

+1

review: Approve

[Alejandro J. Cura (alecu)]

review: Approve

=== modified file 'ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py'
--- ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py	2011-02-16 15:56:43 +0000
+++ ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py	2011-02-21 13:47:38 +0000
@@ -354,7 +354,7 @@
                          out_signature='aa{ss}')
     def get_folders(self):
         """Return the list of folders (a list of dicts)"""
-        return [sd_dbus_iface._get_udf_dict(udf) for udf in self.udfs.values()]
+        return [sd_dbus_iface.get_udf_dict(udf) for udf in self.udfs.values()]
 
     @dbus.service.method(sd_dbus_iface.DBUS_IFACE_FOLDERS_NAME,
                          in_signature='s', out_signature='')
@@ -384,7 +384,7 @@
                          in_signature='s', out_signature='a{ss}')
     def get_info(self, path):
         """Override get_info to avoid accessing filesystem_manager."""
-        for fid, content in self.vm.udfs.iteritems():
+        for fid, content in self.udfs.iteritems():
             if content['path'] == path:
                 return content
         else:
@@ -401,7 +401,7 @@
 
     def setUp(self):
         super(FoldersTestCase, self).setUp()
-        self.patch(sd_dbus_iface, '_get_udf_dict', lambda udf: udf)
+        self.patch(sd_dbus_iface, 'get_udf_dict', lambda udf: udf)
         self.register_mockserver(sd_dbus_iface.DBUS_IFACE_NAME,
                                  "/folders", FoldersMockDBusSyncDaemon)
 
@@ -414,7 +414,7 @@
         result = yield dbus_client.get_folders()
 
         expected = FoldersMockDBusSyncDaemon._new_udf(1, path)
-        self.assertEqual(result, [sd_dbus_iface._get_udf_dict(expected)])
+        self.assertEqual(result, [sd_dbus_iface.get_udf_dict(expected)])
 
     @inlineCallbacks
     def test_get_folders_error(self):
@@ -426,7 +426,7 @@
             """Fake an error."""
             raise TestDBusException(value)
 
-        self.patch(sd_dbus_iface, '_get_udf_dict', fail)
+        self.patch(sd_dbus_iface, 'get_udf_dict', fail)
 
         try:
             yield dbus_client.get_folders()
@@ -442,7 +442,7 @@
         folder_info = yield dbus_client.create_folder(path)
 
         expected = FoldersMockDBusSyncDaemon._new_udf(1, path)
-        self.assertEqual(sd_dbus_iface._get_udf_dict(expected), folder_info)
+        self.assertEqual(sd_dbus_iface.get_udf_dict(expected), folder_info)
 
     @inlineCallbacks
     def test_create_folder_error(self):