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

[Diego Sarmentero]

- Improving tests, patching QThread in the right place (LP: #1066894).

[dobey (dobey)]

This set of changes is what was causing your previous branch failures on merge. I have no reason to believe landing this separately won't also fail.

The bug report says "race condition" but doesn't document any actual failures or examples of what happens when this race occurs. Can you expand on that race condition in the bug report, and please document the failure case in the bug report?

review: Needs Fixing

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/u1-cp-qthread 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]
   ...

[dobey (dobey)]

Setting vote back to needs fixing, as there are additional failures in this now, and the log seems to have sufficient data to help debug this further.

review: Needs Fixing

[Roberto Alsina (ralsina)]

review: Approve

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/u1-cp-qthread 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]
   ...

[dobey (dobey)]

Still failing with same errors.

review: Needs Fixing

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

369. By Diego Sarmentero on 2012-10-16

tests fixed

[dobey (dobey)]

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-08-20 17:51:54 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-10-16 14:22:20 +0000
@@ -19,6 +19,7 @@
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.qt import gui
+from ubuntuone.controlpanel.gui.qt import share_links_search
 from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase, FakedDialog
 
 
@@ -40,6 +41,13 @@
     innerclass_name = "Ui_MainWindow"
     class_ui = gui.MainWindow
 
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set the different tests."""
+        self.patch(share_links_search.SearchBox, "_get_volumes_info",
+            lambda *args, **kwargs: None)
+        yield super(MainWindowTestCase, self).setUp()
+
     def test_close_event_calls_custom_close_callback(self):
         """When closing the window, close_callback is called."""
         self.ui.close_callback = self._set_called

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-10-15 14:58:10 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-10-16 14:22:20 +0000
@@ -19,6 +19,7 @@
 import os
 
 from PyQt4 import QtGui, QtCore
+from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui import (
     SEARCH_FILES,
@@ -41,6 +42,12 @@
     innerclass_name = "Ui_Form"
     class_ui = gui.ShareLinksPanel
 
+    @defer.inlineCallbacks
+    def setUp(self):
+        self.patch(gui.share_links_ui.SearchBox, "_get_volumes_info",
+            lambda *args, **kwargs: None)
+        yield super(ShareLinksTestCase, self).setUp()
+
     def test_setup(self):
         """Check that the strings are properly setted."""
         self.assertEqual(self.ui.ui.search_files_lbl.text(), SEARCH_FILES)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-10-15 14:58:10 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-10-16 14:22:20 +0000
@@ -36,13 +36,17 @@
 
     @defer.inlineCallbacks
     def setUp(self):
+        self.patch(gui.ThreadExploreFolder, "start",
+            lambda *args, **kwargs: self.fake_start())
+        self.patch(gui.SearchBox, "_get_volumes_info",
+            lambda *args, **kwargs: None)
         yield super(SearchBoxTestCase, self).setUp()
 
+        self.ui.home_dir = yield self.ui.backend.get_home_dir()
+        self.ui._thread_explore = gui.ThreadExploreFolder(self.ui.home_dir)
         self.patch(utils, "user_home", USER_HOME)
         self.patch(self.ui._thread_explore, "get_folder_info",
             self.fake_get_folder_info)
-        self.patch(self.ui._thread_explore, "start",
-            lambda *args, **kwargs: self.ui._thread_explore.run())
         self.folder_info = {
             'folder1': [
                 os.path.join(USER_HOME, 'ubuntu', 'file1'),
@@ -57,6 +61,10 @@
         }
         self._slot_item = None
 
+    def fake_start(self):
+        """Fake thread start."""
+        self.ui._thread_explore.run()
+
     def fake_slot(self, item):
         """Fake function to be called when itemSelected is emitted."""
         self._slot_item = item