Merge lp:~ralsina/ubuntuone-control-panel/decrypt-errors-3-0 into lp:ubuntuone-control-panel/stable-3-0

[Roberto Alsina]

 - Hides cryptic error (Fixes LP:1002377).

Fixes something that only happens on windows, where a failure to start syncdaemon will cause sd_client to be None.

Proposing only for stable-3-0 because in trunk, with endpoints, this is not supposed to happen anymore, but we will still do future windows releases from 3-0

This should not have any effects on Ubuntu.

[dobey (dobey)]

review: Approve

[Manuel de la Peña (mandel)]

A little ugly but works and is not needed in trunk.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~ralsina/ubuntuone-control-panel/decrypt-errors-3-0 into lp:ubuntuone-control-panel/stable-3-0 failed. Below is the output from the failed tests.

*** Running test suite for ubuntuone/controlpanel ***
ubuntuone.controlpanel.tests.test_replication_client
  ReplicationsTestCase
    test_exclude ... [OK]
    test_exclude_name_in_exclusions ... [OK]
    test_exclude_name_not_in_replications ... [OK]
    test_get_exclusions ... [OK]
    test_get_replications ... [OK]
    test_no_pairing_record ... [OK]
    test_replicate ... [OK]
    test_replicate_name_not_in_exclusions ... [OK]
    test_replicate_name_not_in_replications ... [OK]
ubuntuone.controlpanel.tests
  TestCase
    runTest ... [OK]
ubuntuone.controlpanel.tests.test_backend
  BackendAccountTestCase
    test_account_info ... [OK]
    test_account_info_fails ... [OK]
    test_account_info_fails_with_unauthorized ... [OK]
    test_account_info_with_current_plan ... [OK]
    test_backend_creation ... [OK]
    test_device_is_local ... [OK]
    test_get_token ... [OK]
    test_login_client_is_cached ... [OK]
    test_sd_client_is_cached ... [OK]
    test_shutdown_func ... [OK]
    test_shutdown_func_is_called_on_shutdown ... [OK]
    test_shutdown_func_when_none ... [OK]
  BackendBasicTestCase
    test_backend_creation ... [OK]
    test_device_is_local ... [OK]
    test_get_token ... [OK]
    test_login_client_is_cached ... [OK]
    test_sd_client_is_cached ... [OK]
    test_shutdown_func ... [OK]
    test_shutdown_func_is_called_on_shutdown ... [OK]
    test_shutdown_func_when_none ... [OK]
  BackendCredentialsTestCase
    test_backend_creation ... [OK]
    test_clear_credentials ... [OK]
    test_clear_credentials_invalidates_cached_credentials ... [OK]
    test_credentials_are_cached ... [OK]
    test_device_is_l...

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2012-05-18 16:49:05 +0000
+++ ubuntuone/controlpanel/backend.py	2012-05-28 17:58:17 +0000
@@ -106,6 +106,10 @@
     return inner
 
 
+class SyncDaemonException(Exception):
+    """A problem instantiating SyncDaemonClient."""
+
+
 class ControlBackend(object):
     """The control panel backend."""
 
@@ -135,6 +139,9 @@
 
         self.login_client = CredentialsManagementTool()
         self.sd_client = sd_client.SyncDaemonClient()
+        if self.sd_client is None:
+            # Probably syncdaemon is not starting
+            raise SyncDaemonException("Error creating SyncDaemonClient.")
         self.wc = WebClient(self.get_credentials)
 
         logger.info('ControlBackend: instance started.')

=== modified file 'ubuntuone/controlpanel/gui/qt/ubuntuonebin.py'
--- ubuntuone/controlpanel/gui/qt/ubuntuonebin.py	2012-02-29 17:39:03 +0000
+++ ubuntuone/controlpanel/gui/qt/ubuntuonebin.py	2012-05-28 17:58:17 +0000
@@ -51,6 +51,11 @@
                                 error_handler=self._error_handler)
         self.load = handler(self.load)
 
+        # Ensure we load the backend here, so it shows an error if needed
+        # pylint: disable=W0104
+        self.backend
+        # pylint: enable=W0104
+
         self._setup()
 
     def _get_is_processing(self):

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2012-05-18 16:49:05 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2012-05-28 17:58:17 +0000
@@ -361,6 +361,15 @@
     raise ValueError(args)
 
 
+class SDClientFailureTestCase(TestCase):
+    """Test behaviour in class of sd_client instantiation failure."""
+
+    def test_sd_client_is_none(self):
+        """A failing SyncDaemonClient should trigger exception."""
+        self.patch(backend.sd_client, "SyncDaemonClient", lambda: None)
+        self.assertRaises(backend.SyncDaemonException, backend.ControlBackend)
+
+
 class BackendBasicTestCase(TestCase):
     """Simple tests for the backend."""