Merge lp:~nataliabidart/ubuntuone-control-panel/services-more-robust into lp:ubuntuone-control-panel

[Natalia Bidart]

- Small improvement to show something else besides the generic "Value can not be retrieved." error (LP: #722485).

[Eric Casteleijn (thisfred)]

awesome

review: Approve

[Roberto Alsina (ralsina)]

+1, I hated that error.

review: Approve

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-03-30 19:47:22 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-04-01 16:22:14 +0000
@@ -55,7 +55,8 @@
 from ubuntuone.controlpanel.backend import (DEVICE_TYPE_PHONE,
     DEVICE_TYPE_COMPUTER, bool_str)
 from ubuntuone.controlpanel.logger import setup_logging, log_call
-from ubuntuone.controlpanel.utils import get_data_file
+from ubuntuone.controlpanel.utils import (get_data_file,
+    ERROR_TYPE, ERROR_MESSAGE)
 
 from ubuntuone.controlpanel.gtk import package_manager, TRANSLATION_DOMAIN
 
@@ -68,6 +69,7 @@
 ERROR_COLOR = 'red'
 LOADING = _('Loading...')
 VALUE_ERROR = _('Value could not be retrieved.')
+UNKNOWN_ERROR = _('Unknown error')
 WARNING_MARKUP = '<span foreground="%s"><b>%%s</b></span>' % ERROR_COLOR
 KILOBYTES = 1024
 NO_OP = lambda *a, **kw: None
@@ -240,10 +242,19 @@
         self.message.set_markup(message)
 
     @log_call(logger.error)
-    def on_error(self, message=None):
+    def on_error(self, message=None, error_dict=None):
         """Use this callback to stop the Loading and set a warning message."""
-        if message == None:
+        if message is None and error_dict is None:
             message = VALUE_ERROR
+        elif message is None and error_dict is not None:
+            error_type = error_dict.get(ERROR_TYPE, UNKNOWN_ERROR)
+            error_msg = error_dict.get(ERROR_MESSAGE)
+            if error_msg:
+                message = "%s (%s: %s)" % (VALUE_ERROR, error_type, error_msg)
+            else:
+                message = "%s (%s)" % (VALUE_ERROR, error_type)
+
+        assert message is not None
 
         self.message.stop()
         self.message.set_markup(WARNING_MARKUP % message)
@@ -557,7 +568,7 @@
     @log_call(logger.error)
     def on_volumes_info_error(self, error_dict=None):
         """Backend notifies of an error when fetching volumes info."""
-        self.on_error()
+        self.on_error(error_dict=error_dict)
 
     @log_call(logger.info)
     def on_volume_settings_changed(self, volume_id):
@@ -875,7 +886,7 @@
     @log_call(logger.error)
     def on_devices_info_error(self, error_dict=None):
         """Backend notifies of an error when fetching volumes info."""
-        self.on_error()
+        self.on_error(error_dict=error_dict)
         self.is_processing = False
 
     @log_call(logger.warning)
@@ -1200,6 +1211,7 @@
     @log_call(logger.debug)
     def load(self):
         """Load info."""
+        self.replications.hide()
         if self.install_box is not None:
             self.itself.remove(self.install_box)
             self.install_box = None
@@ -1207,7 +1219,6 @@
         logger.info('load: has_desktopcouch? %r', self.has_desktopcouch)
         if not self.has_desktopcouch:
             self.message.set_text('')
-            self.replications.hide()
 
             self.install_box = InstallPackage(self.DESKTOPCOUCH_PKG)
             self.install_box.connect('finished', self.load_replications)
@@ -1259,7 +1270,7 @@
            error_dict.get('error_type', None) == 'NoPairingRecord':
             self.on_error(self.NO_PAIRING_RECORD)
         else:
-            self.on_error()
+            self.on_error(error_dict=error_dict)
 
 
 class FileSyncStatus(gtk.HBox, ControlPanelMixin):

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-03-29 19:14:21 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-04-01 16:22:14 +0000
@@ -324,6 +324,42 @@
         self.assert_warning_correct(self.ui.message, msg)
         self.assertFalse(self.ui.message.active)
 
+    def test_on_error_with_error_dict(self):
+        """Callback to stop the Loading and show the error from error_dict."""
+        msg = u'Qué mala suerte! <i>this does not rock</i>'
+        error_dict = {gui.ERROR_TYPE: 'YaddaError', gui.ERROR_MESSAGE: msg}
+        self.ui.on_error(error_dict=error_dict)
+
+        expected_msg = "%s (%s: %s)" % (gui.VALUE_ERROR, 'YaddaError', msg)
+        self.assert_warning_correct(self.ui.message, expected_msg)
+        self.assertFalse(self.ui.message.active)
+
+    def test_on_error_with_error_dict_without_error_type(self):
+        """Callback to stop the Loading and show the error from error_dict."""
+        error_dict = {}
+        self.ui.on_error(error_dict=error_dict)
+
+        expected_msg = "%s (%s)" % (gui.VALUE_ERROR, gui.UNKNOWN_ERROR)
+        self.assert_warning_correct(self.ui.message, expected_msg)
+        self.assertFalse(self.ui.message.active)
+
+    def test_on_error_with_error_dict_without_error_message(self):
+        """Callback to stop the Loading and show the error from error_dict."""
+        error_dict = {gui.ERROR_TYPE: 'YaddaError'}
+        self.ui.on_error(error_dict=error_dict)
+
+        expected_msg = "%s (%s)" % (gui.VALUE_ERROR, 'YaddaError')
+        self.assert_warning_correct(self.ui.message, expected_msg)
+        self.assertFalse(self.ui.message.active)
+
+    def test_on_error_with_message_and_error_dict(self):
+        """Callback to stop the Loading and show a info message."""
+        error_dict = {gui.ERROR_TYPE: 'YaddaError', gui.ERROR_MESSAGE: 'test'}
+        msg = 'WOW! <i>this does not rock</i> :-/'
+        self.ui.on_error(message=msg, error_dict=error_dict)
+        self.assert_warning_correct(self.ui.message, msg)
+        self.assertFalse(self.ui.message.active)
+
     def test_is_processing(self):
         """The flag 'is_processing' is False on start."""
         self.assertFalse(self.ui.is_processing)