Merge lp:~diegosarmentero/ubuntuone-control-panel/u1-cp-publishapi into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Move signals connection because they get deleted after they are emitted.

[Mike McCracken (mikemc)]

For the next reviewer - to test this IRL, run control-panel and check that you can share one file and then a second. Without this branch, you can share one file but not a second.

review: Approve

[Manuel de la Peña (mandel)]

Is this fix still needed? WE already have lists for the handlers in trunk AFAIK.

review: Needs Fixing

[Manuel de la Peña (mandel)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/u1-cp-publishapi into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/u1-cp-publishapi into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
...

[lp:~diegosarmentero/ubuntuone-control-panel/u1-cp-publishapi]

366. By Diego Sarmentero on 2012-10-15

removing qthread refactor

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links.py'
--- ubuntuone/controlpanel/gui/qt/share_links.py	2012-10-15 14:12:20 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links.py	2012-10-15 14:41:20 +0000
@@ -90,16 +90,14 @@
         self.ui.tree_shared_files.itemDoubleClicked.connect(
             self._open_properties_selected_file)
 
-        # Connect backend signals
-        self.backend.set_public_files_list_handler(self._load_public_files)
+        self.get_public_files()
+
+    @inlineCallbacks
+    def share_file(self, file_path):
+        """Clean the previous file share details and publish file_path."""
         self.backend.set_public_access_changed_handler(self._file_shared)
         self.backend.set_public_access_change_error_handler(
             lambda: self._set_is_processing(False))
-        self.get_public_files()
-
-    @inlineCallbacks
-    def share_file(self, file_path):
-        """Clean the previous file share details and publish file_path."""
         file_path = unicode(file_path)
         if self.ui.hbox_share_file.count() > 0:
             widget = self.ui.hbox_share_file.takeAt(0).widget()
@@ -156,6 +154,7 @@
     @inlineCallbacks
     def get_public_files(self):
         """Request the list of public files."""
+        self.backend.set_public_files_list_handler(self._load_public_files)
         self.is_processing = True
         self.home_dir = yield self.backend.get_home_dir()
         yield self.backend.get_public_files()

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-10-15 14:12:20 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-10-15 14:41:20 +0000
@@ -55,6 +55,11 @@
 
     def test_share_file(self):
         """Check that the state of the widgets on share_file."""
+        data = []
+        self.patch(self.ui.backend, "set_public_access_changed_handler",
+            data.append)
+        self.patch(self.ui.backend, "set_public_access_change_error_handler",
+            data.append)
         path = '/home/user/Ubuntu One/file1.txt'
         self.ui.share_file(path)
         self.assertTrue(self.ui.is_processing)
@@ -63,6 +68,8 @@
         self.assertEqual(widget.ui.lbl_filename.text(),
             os.path.basename(path))
         self.assertEqual(widget.ui.lbl_path.text(), path)
+        self.assertEqual(len(data), 2)
+        self.assertEqual(data[0], self.ui._file_shared)
 
     def test_share_file_actions(self):
         """Check the behaviour of share_file buttons."""
@@ -125,10 +132,15 @@
 
     def test_get_public_files(self):
         """Test that the proper actions are executed on files requested.."""
+        data = []
+        self.patch(self.ui.backend, "set_public_files_list_handler",
+            data.append)
         self.ui.get_public_files()
         self.assertTrue(self.ui.is_processing)
         self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 0)
         self.assertEqual(self.ui.home_dir, USER_HOME)
+        self.assertEqual(len(data), 1)
+        self.assertEqual(data[0], self.ui._load_public_files)
 
     def test_line_close_btn(self):
         """Check that the popup is hidden."""