Merge lp:~nataliabidart/ubuntuone-control-panel/folders-if-new-creds into lp:ubuntuone-control-panel

[Natalia Bidart]

* After machine was added, Folders page is shown (LP: #674459).* VolumesInfoError signal is now handled (LP: #690292).

* VolumesInfoError signal is now handled (LP: #690292).

* When FileSyncStatusError is received, no more DbusException messages are leaked to the end user (LP: #690305).

To run the tests, use the command:

./run-tests

To test, open 2 terminals pointing to this branch.
You should remove your Ubuntu One token from seahorse to ensure following the expected workflow.

In terminal 1:

DEBUG=True PYTHONPATH=. ./bin/ubuntuone-control-panel-backend

In terminal 2:

DEBUG=True PYTHONPATH=. ./bin/ubuntuone-control-panel-gtk

You'll see the "overview" screen (just like https://bugs.launchpad.net/ubuntuone-control-panel/+bug/690315/+attachment/1766070/+files/u1cp-overview.png).

Login (or register, as you prefer) and you should be taken directly to the "Folders" tab.
If you close the GTK UI and re open, you'll see the Account page.

[lp:~nataliabidart/ubuntuone-control-panel/folders-if-new-creds]

36. By Natalia Bidart on 2010-12-14

Binding bug nhumbers.

[Roman Yepishev (rye)]

Folders tab showing after authorization, account tab showing on subsequent startups: OK
Volume list errors: http://ubuntuone.com/p/U17/: OK
File status retrieval error: http://ubuntuone.com/p/U1G/: OK

review: Approve (fieldtest)

[Roberto Alsina (ralsina)]

Looks good to me.

review: Approve

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2010-12-14 20:41:48 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2010-12-14 20:41:48 +0000
@@ -176,17 +176,25 @@
         ControlPanelMixin.__init__(self, filename='controlpanel.ui')
         self._window_id = window_id
 
+        self.management = None
         self.overview = OverviewPanel(window_id=window_id)
         self.overview.connect('credentials-found',
                               self.on_show_management_panel)
         self.add(self.overview)
         self.show()
 
-    def on_show_management_panel(self, *args, **kwargs):
+    def on_show_management_panel(self, widget=None,
+                                 credentials_are_new=False, token=None):
         """Show the netbook (main panel)."""
         if self.overview in self.get_children():
             self.remove(self.overview)
-            self.add(ManagementPanel())
+
+            self.management = ManagementPanel()
+            if credentials_are_new:
+                # redirect user to Folders page to review folders subscription
+                self.management.folders_button.clicked()
+
+            self.add(self.management)
 
 
 class UbuntuOneBin(gtk.VBox):
@@ -228,6 +236,7 @@
         self.warning_label.set_property('xalign', 0.5)
         self.warning_label.connect('size-allocate', self.on_size_allocate)
 
+        self._credentials_are_new = False
         self._messages = messages
         self._window_id = window_id
         self._build_messages()
@@ -318,13 +327,14 @@
     @log_call(logger.info)
     def on_credentials_found(self, app_name, credentials):
         """SSO backend notifies of credentials found."""
-        self.emit('credentials-found', app_name, credentials)
+        self.emit('credentials-found', self._credentials_are_new, credentials)
         self.hide()
 
     @filter_by_app_name
     @log_call(logger.info)
     def on_credentials_not_found(self, app_name):
         """SSO backend notifies of credentials not found."""
+        self._credentials_are_new = True
         self.set_property('greyed', False)
 
     @filter_by_app_name
@@ -434,6 +444,7 @@
 
         if not info:
             self.volumes_label.set_markup(self.NO_VOLUMES)
+            self.label_alignment.show()
             return
         else:
             self.label_alignment.hide()
@@ -467,6 +478,9 @@
     @log_call(logger.error)
     def on_volumes_info_error(self, error_dict=None):
         """Backend notifies of an error when fetching volumes info."""
+        self.volumes_label.stop()
+        self._set_warning(self.VALUE_ERROR, self.volumes_label)
+        self.label_alignment.show()
 
     def on_subscribed_clicked(self, checkbutton):
         """The user toggled 'checkbutton'."""
@@ -576,6 +590,7 @@
 
         self.backend.account_info()
         self.backend.file_sync_status()
+        self.account_button.clicked()
 
     def _update_quota(self, msg, data=None):
         """Update the quota info."""
@@ -634,12 +649,9 @@
     @log_call(logger.error)
     def on_file_sync_status_error(self, error_dict=None):
         """Backend notifies of an error when fetching file sync status."""
-        msg = error_dict.get('error_msg', None)
-        if msg is None:
-            msg = error_dict.get('message', self.VALUE_ERROR)
-        self._update_status(WARNING_MARKUP % msg)
+        self._update_status(WARNING_MARKUP % self.FILE_SYNC_ERROR)
 
 
 gobject.signal_new('credentials-found', OverviewPanel,
                     gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
-                   (gobject.TYPE_STRING, gobject.TYPE_PYOBJECT))
+                   (gobject.TYPE_BOOLEAN, gobject.TYPE_PYOBJECT))
 
=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui.py	2010-12-14 20:41:48 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui.py	2010-12-14 20:41:48 +0000
@@ -309,6 +309,34 @@
 
         self.assertEqual(1, len(self.ui.get_children()))
 
+    def test_credentials_found_shows_account_management_panel(self):
+        """On 'credentials-found' signal, the management panel is shown.
+
+        If first signal parameter is False, visible tab should be account.
+
+        """
+        a_token = object()
+        self.ui.overview.emit('credentials-found', False, a_token)
+
+        children = self.ui.get_children()
+        self.assertIsInstance(children[-1], gui.ManagementPanel)
+        self.assertEqual(self.ui.management.notebook.get_current_page(),
+                         self.ui.management.ACCOUNT_PAGE)
+
+    def test_credentials_found_shows_folders_management_panel(self):
+        """On 'credentials-found' signal, the management panel is shown.
+
+        If first signal parameter is True, visible tab should be folders.
+
+        """
+        a_token = object()
+        self.ui.overview.emit('credentials-found', True, a_token)
+
+        children = self.ui.get_children()
+        self.assertIsInstance(children[-1], gui.ManagementPanel)
+        self.assertEqual(self.ui.management.notebook.get_current_page(),
+                         self.ui.management.FOLDERS_PAGE)
+
 
 class UbuntuOneBinTestCase(BaseTestCase):
     """The test suite for a Ubuntu One panel."""
@@ -425,6 +453,7 @@
 
     def test_find_credentials_is_called(self):
         """Credentials are asked to SSO backend."""
+        self.assertFalse(self.ui._credentials_are_new)
         self.assert_backend_called('find_credentials', (gui.U1_APP_NAME, {}),
                                    backend=self.ui.sso_backend)
 
@@ -435,12 +464,27 @@
         self.ui.on_credentials_found(gui.U1_APP_NAME, TOKEN)
 
         self.assertFalse(self.ui.get_visible())
-        self.assertEqual(self._called, ((self.ui, gui.U1_APP_NAME, TOKEN), {}))
+        # assume credentials were in local keyring
+        self.assertEqual(self._called, ((self.ui, False, TOKEN), {}))
+
+    def test_on_credentials_found_when_creds_are_not_new(self):
+        """Callback 'on_credentials_found' distinguish if creds are new."""
+        self.ui.connect('credentials-found', self._set_called)
+
+        # credentials weren't in the system
+        self.ui.on_credentials_not_found(gui.U1_APP_NAME)
+        # now they are!
+        self.ui.on_credentials_found(gui.U1_APP_NAME, TOKEN)
+
+        self.assertFalse(self.ui.get_visible())
+        # assume credentials were not in local keyring
+        self.assertEqual(self._called, ((self.ui, True, TOKEN), {}))
 
     def test_on_credentials_not_found(self):
         """Callback 'on_credentials_not_found' is correct."""
         self.ui.on_credentials_not_found(gui.U1_APP_NAME)
         self.assertTrue(self.ui.get_visible())
+        self.assertTrue(self.ui._credentials_are_new)
 
     def test_on_credentials_error(self):
         """Callback 'on_credentials_error' is correct."""
@@ -779,10 +823,6 @@
             self.assertEqual(volume['volume_id'], check.get_label())
             self.assertFalse(check.get_child().get_visible())
 
-    def test_on_volumes_info_error(self):
-        """The volumes info couldn't be retrieved."""
-        self.ui.on_volumes_info_error()
-
     def test_on_volumes_info_ready_clears_the_list(self):
         """The old volumes info is cleared before updated."""
         self.ui.on_volumes_info_ready(FAKE_VOLUMES_INFO)
@@ -823,6 +863,23 @@
             self.assert_backend_called('change_volume_settings',
                                        (fid, {'subscribed': subscribed}))
 
+    def test_on_volumes_info_error(self):
+        """The volumes info couldn't be retrieved."""
+        self.ui.on_volumes_info_error()
+        self.assert_warning_correct(warning=self.ui.volumes_label,
+                                    text=self.ui.VALUE_ERROR)
+        self.assertFalse(self.ui.volumes_label.active)
+        self.assertTrue(self.ui.label_alignment.get_visible())
+
+    def test_on_volumes_info_error_after_success(self):
+        """The volumes info couldn't be retrieved after a prior success."""
+        self.ui.on_volumes_info_ready(FAKE_VOLUMES_INFO)
+
+        self.ui.on_volumes_info_error()
+
+        self.test_on_volumes_info_error()
+        self.test_on_volumes_info_ready_with_no_volumes()
+
 
 class DevicesTestCase(ControlPanelMixinTestCase):
     """The test suite for the devices panel."""
@@ -1058,5 +1115,6 @@
         """The file sync status couldn't be retrieved."""
         self.ui.on_file_sync_status_error({'error_msg': 'error msg'})
 
-        self.assert_warning_correct(self.ui.status_label, 'error msg')
+        self.assert_warning_correct(self.ui.status_label,
+                                    self.ui.FILE_SYNC_ERROR)
         self.assertFalse(self.ui.status_label.active)