Merge lp:~nataliabidart/ubuntuone-control-panel/offline-experience into lp:ubuntuone-control-panel

[Natalia Bidart]

- If network connection is UNKNOWN, assume that there is an internet connection (LP: #720990).
- Replaced in Account tab 'Value could not be retrieved' by a better legend (LP: #720990).

To test, you should start the UI having network, and not having network.

[Roberto Alsina (ralsina)]

+1 as discussed on IRC

review: Approve

[Martin Albisetti (beuno)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~nataliabidart/ubuntuone-control-panel/offline-experience into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

Running test suite for ubuntuone/controlpanel/tests
Xlib: extension "RANDR" missing on display ":99".
ubuntuone.controlpanel.tests.test_backend
  BackendAccountTestCase
    test_account_info ... [OK]
    test_account_info_fails ... [OK]
    test_account_info_with_current_plan ... [OK]
    test_backend_creation ... [OK]
    test_device_is_local ... [OK]
    test_get_token ... [OK]
  BackendBasicTestCase
    test_backend_creation ... [OK]
    test_device_is_local ... [OK]
    test_get_token ... [OK]
  BackendDevicesTestCase
    test_backend_creation ... [OK]
    test_change_download_speed_limit ... [OK]
    test_change_limit_bandwidth ... [OK]
    test_change_show_all_notifications ... [OK]
    test_change_upload_speed_limit ... [OK]
    test_changing_settings_for_wrong_id_has_no_effect ... [OK]
    test_device_is_local ... [OK]
    test_devices_info ... [OK]
    test_devices_info_fails ... [OK]
    test_get_token ... [OK]
    test_remove_device ... [OK]
    test_remove_device_clear_credentials_if_local_device ... [OK]
    test_remove_device_fails ... [OK]
  BackendFileSyncOpsTestCase
    test_backend_creation ... [OK]
    test_connect_files ... [OK]
    test_device_is_local ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_get_token ... [OK]
    test_restart_files ... [OK]
    test_start_files ... [OK]
    test_stop_files ... [OK]
  BackendReplicationsTestCase
    test_backend_creation ... [OK]
    test_change_replication_settings ... [OK]
    test_change_replication_settings_...

=== modified file 'data/overview.ui'
--- data/overview.ui	2011-02-11 20:06:35 +0000
+++ data/overview.ui	2011-03-03 18:39:06 +0000
@@ -181,7 +181,9 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property>
+                        <property name="use_markup">True</property>
                         <property name="wrap">True</property>
+                        <property name="width_chars">30</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-03-03 03:18:14 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-03-03 18:39:06 +0000
@@ -213,9 +213,6 @@
     AUTHORIZATION_DENIED = _('The authentication was cancelled.')
     NETWORK_OFFLINE = _('An internet connection is required to join or sign '
         'in to %(app_name)s.')
-    NETWORK_UNKNOWN = _('The internet connection state couldn\'t be '
-        'discovered. Maybe NetworkManager is not running?')
-
     CONNECT = _('Connect to Ubuntu One')
 
     def __init__(self, main_window):
@@ -330,18 +327,14 @@
     @log_call(logger.info)
     def on_network_state_changed(self, state):
         """Network state is reported."""
-        msg = None
+        msg = ''
         if state is networkstate.OFFLINE:
             msg = self.NETWORK_OFFLINE % {'app_name': U1_APP_NAME}
-        elif state is networkstate.UNKNOWN:
-            msg = self.NETWORK_UNKNOWN
-
-        if msg is not None:
             self.set_sensitive(False)
             self._set_warning(msg)
         else:
             self.set_sensitive(True)
-            self.warning_label.set_text('')
+            self.warning_label.set_text(msg)
             self.sso_backend.find_credentials(U1_APP_NAME, {},
                 reply_handler=NO_OP, error_handler=error_handler)
 
@@ -350,6 +343,8 @@
     """The dashboard panel. The user can manage the subscription."""
 
     TITLE = _('Welcome to Ubuntu One!')
+    VALUE_ERROR = _('The information could not be retrieved. '
+        'Maybe your internet connection is down?')
 
     def __init__(self, main_window=None):
         UbuntuOneBin.__init__(self)
@@ -380,7 +375,7 @@
     @log_call(logger.error)
     def on_account_info_error(self, error_dict=None):
         """Backend notifies of an error when fetching account info."""
-        self.on_error()
+        self.on_error(message=self.VALUE_ERROR)
         self.is_processing = False
 
 
@@ -1278,7 +1273,11 @@
     @log_call(logger.error)
     def on_file_sync_status_error(self, error_dict=None):
         """Backend notifies of an error when fetching file sync status."""
-        self._update_status(WARNING_MARKUP % self.FILE_SYNC_ERROR,
+        msg = self.FILE_SYNC_ERROR
+        reason = error_dict.get('error_msg', '') if error_dict else ''
+        if reason:
+            msg += ' (' + reason + ')'
+        self._update_status(WARNING_MARKUP % msg,
                             self.RESTART, self.on_restart_clicked,
                             tooltip=self.RESTART_TOOLTIP)
 
@@ -1414,6 +1413,11 @@
             self.quota_label.set_markup(msg)
         self.quota_label.stop()
 
+        if fraction == 0.0:
+            self.quota_progressbar.set_sensitive(False)
+        else:
+            self.quota_progressbar.set_sensitive(True)
+
         self.quota_progressbar.set_fraction(min(fraction, 1))
 
     def load(self):
@@ -1433,7 +1437,7 @@
     @log_call(logger.error)
     def on_account_info_error(self, error_dict=None):
         """Backend notifies of an error when fetching account info."""
-        self._update_quota(WARNING_MARKUP % VALUE_ERROR)
+        self._update_quota(msg='')
 
 
 class ControlPanel(gtk.Notebook):

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-03-03 03:18:14 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-03-03 18:39:06 +0000
@@ -104,7 +104,7 @@
         self.ui.on_account_info_error()
 
         self.assertFalse(self.ui.account.get_visible())
-        self.assert_warning_correct(self.ui.message, gui.VALUE_ERROR)
+        self.assert_warning_correct(self.ui.message, self.ui.VALUE_ERROR)
 
 
 class VolumesTestCase(ControlPanelMixinTestCase):
@@ -1574,7 +1574,8 @@
         """
         self.assertTrue(self.ui.label.get_visible())
         self.assertFalse(self.ui.label.active)
-        self.assertTrue(self.ui.label.get_label().endswith(status))
+        msg = '%r does not end with %r' % (self.ui.label.get_label(), status)
+        self.assertTrue(self.ui.label.get_label().endswith(status), msg)
 
         self.assertTrue(self.ui.button.is_sensitive())
         self.assertFalse(self.ui.button.get_visited())
@@ -1721,10 +1722,21 @@
                                    action=self.ui.DISCONNECT,
                                    tooltip=self.ui.DISCONNECT_TOOLTIP)
 
-    def test_on_file_sync_status_error(self):
-        """The file sync status couldn't be retrieved."""
-        self.patch(self.ui, 'on_restart_clicked', self._set_called)
-        self.ui.on_file_sync_status_error({'error_msg': 'error msg'})
+    def test_on_file_sync_status_error_with_error_msg(self):
+        """The file sync status couldn't be retrieved."""
+        self.patch(self.ui, 'on_restart_clicked', self._set_called)
+        msg = 'error message'
+        self.ui.on_file_sync_status_error({'error_msg': msg})
+
+        msg = gui.WARNING_MARKUP % (self.ui.FILE_SYNC_ERROR + ' (' + msg + ')')
+        self.assert_status_correct(msg,
+                                   action=self.ui.RESTART,
+                                   tooltip=self.ui.RESTART_TOOLTIP)
+
+    def test_on_file_sync_status_error_without_error_msg(self):
+        """The file sync status couldn't be retrieved."""
+        self.patch(self.ui, 'on_restart_clicked', self._set_called)
+        self.ui.on_file_sync_status_error()
 
         msg = gui.WARNING_MARKUP % self.ui.FILE_SYNC_ERROR
         self.assert_status_correct(msg,
@@ -1799,6 +1811,7 @@
             progressbar_fraction = min(percentage / 100, 1)
         self.assertEqual(self.ui.quota_progressbar.get_fraction(),
                          progressbar_fraction)
+        self.assertTrue(self.ui.quota_progressbar.get_sensitive())
 
     def test_is_a_vbox(self):
         """Inherits from gtk.VBox."""
@@ -1920,9 +1933,16 @@
     def test_on_account_info_error(self):
         """The account info couldn't be retrieved."""
         self.ui.on_account_info_error()
-        self.assert_warning_correct(self.ui.quota_label, gui.VALUE_ERROR)
+        self.assertEqual(self.ui.quota_label.get_text(), '')
+        self.assertEqual(self.ui.quota_progressbar.get_fraction(), 0)
+        self.assertFalse(self.ui.quota_progressbar.get_sensitive())
         self.assertFalse(self.ui.quota_label.active)
 
+    def test_on_account_info_error_after_success(self):
+        """The account info couldn't be retrieved."""
+        self.test_on_account_info_ready()
+        self.test_on_account_info_error()
+
     def test_on_account_info_ready_quota_unused(self):
         """The used quota is correct when unused."""
         info = FAKE_ACCOUNT_INFO.copy()

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-03-01 15:32:22 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-03-03 18:39:06 +0000
@@ -366,12 +366,11 @@
         self.assertFalse(self.ui.get_sensitive())
 
     def test_state_unknown(self):
-        """Network connection is unknown."""
+        """Network connection is unknown. Assume that connection is present."""
         self.ui.on_network_state_changed(gui.networkstate.UNKNOWN)
 
-        self.assert_warning_correct(self.ui.warning_label,
-                                    self.ui.NETWORK_UNKNOWN)
-        self.assertFalse(self.ui.get_sensitive())
+        self.assertEqual(self.ui.warning_label.get_text(), '')
+        self.assertTrue(self.ui.get_sensitive())
 
 
 class OverwiewPanelOnlineTestCase(OverwiewPanelTestCase):