Merge lp:~ralsina/ubuntuone-windows-installer/start-with-overlay into lp:ubuntuone-windows-installer

[Roberto Alsina]

* Change the default "Next Page" for the license page to not-None
* Block the UI (using the overlay) until the find_credentials call is done

* Change the default "Next Page" for the license page to not-None
* Block the UI (using the overlay) until the find_credentials call is done

[lp:~ralsina/ubuntuone-windows-installer/start-with-overlay]

33. By Roberto Alsina on 2011-08-12

pep8 fix

[Natalia Bidart (nataliabidart)]

As we discussed in IRC, some tests will be added for the fixes proposed in this branch.

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/start-with-overlay]

34. By Roberto Alsina on 2011-08-12

added tests

[Roberto Alsina (ralsina)]

> As we discussed in IRC, some tests will be added for the fixes proposed in
> this branch.

Tests added in revno 34

[lp:~ralsina/ubuntuone-windows-installer/start-with-overlay]

35. By Roberto Alsina on 2011-08-15

 no help

[Natalia Bidart (nataliabidart)]

Aproving but please fix a couple of lint issues:

== Python Lint Notices ==

ubuntuone_installer/gui/qt/gui.py:
    412: [C0111, MainWindow.creds_eb] Missing docstring

ubuntuone_installer/gui/qt/local_folders.py:
    178: [W0702, LocalFoldersPage.show_hide_offer] No exception type(s) specified
    213: [W0702, LocalFoldersPage.on_add_storage_button_clicked] No exception type(s) specified

ubuntuone_installer/gui/qt/tests/test_gui.py:
    561: [E0211, FakeCPBackend.account_info] Method has no argument
    561: [C0111, FakeCPBackend.account_info] Missing docstring

review: Approve

[lp:~ralsina/ubuntuone-windows-installer/start-with-overlay]

36. By Roberto Alsina on 2011-08-15

lint fixes

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'setup.py'
--- setup.py	2011-08-12 13:08:01 +0000
+++ setup.py	2011-08-15 21:44:23 +0000
@@ -114,7 +114,8 @@
         path = os.getenv('PATH')
         os.putenv('PATH', path + os.path.pathsep + os.path.join(
                   os.path.dirname(PyQt4.__file__), 'bin'))
-        if os.system('pyrcc4 -no-compress "%s" -o "%s"' % (qrc_file, py_file)) > 0:
+        if os.system('pyrcc4 -no-compress "%s" -o "%s"' %
+            (qrc_file, py_file)) > 0:
             self.warn('Unable to generate python module {py_file}'
                       ' for resource file {qrc_file}'.format(
                       py_file=py_file, qrc_file=qrc_file))
 
=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-08-12 00:46:00 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-08-15 21:44:23 +0000
@@ -87,7 +87,8 @@
 SIGN_IN_SUBTITLE = _("Sign in with your existing Ubuntu One"
     " username and password.")
 TITLE_STYLE = "<span style=\"font-size:24px\">%s</span>"
-
+CREDENTIALS_ERROR_TITLE = _("Error getting credentials")
+CREDENTIALS_ERROR = _('Application will close.\n\n%r')
 # Invalid name logger
 # pylint: disable=C0103
 logger = setup_logging('qt.gui')
@@ -149,7 +150,7 @@
     def nextId(self):
         """Return next page's ID."""
         if self._next_id is None:
-            return super(LicensePage, self).nextId()
+            return self.wizard().SIGNIN_PAGE
         return self._next_id
 
 
@@ -303,7 +304,6 @@
 
         self.setSideWidget(SideWidget())
         self.overlay = LoadingOverlay(self)
-        self.overlay.hide()
 
         self.setOption(self.NoBackButtonOnStartPage, True)
 
@@ -404,14 +404,23 @@
         credtool = CredentialsManagementTool()
         d = credtool.find_credentials()
         d.addCallback(self.creds_cb)
-        d.addErrback(lambda exc: logger.error(
-            'Error while getting the credentials: %r', exc))
+        d.addErrback(self.creds_eb)
 
     # Invalid name "closeEvent"
     # pylint: disable=C0103
 
+    def creds_eb(self, exc):
+        """Handle credentials error."""
+        self.LICENSE_PAGE._next_id = self.SIGNIN_PAGE
+        self.critical(self, CREDENTIALS_ERROR_TITLE,
+            CREDENTIALS_ERROR % exc.value)
+        logger.error(
+            'Error while getting the credentials: %r', exc.value)
+        self.close()
+
     def creds_cb(self, token):
         """Change wizard flow if we have credentials."""
+        self.overlay.hide()
         if not token:
             self.LICENSE_PAGE._next_id = self.SIGNIN_PAGE
         else:
 
=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-08-11 17:46:11 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-08-15 21:44:23 +0000
@@ -172,10 +172,11 @@
         Returns a deferred that is triggered when the update is finished.
 
         """
+        # pylint: disable=W0702
         try:
             user_info = yield self.ui.add_folder_button.backend.account_info()
         except:
-            logger.exception('Error while trying to update que quota:')
+            logger.exception('Error while trying to get account info:')
 
         quota = user_info['quota_total']
         if cur_size > quota:
@@ -206,11 +207,13 @@
     def on_add_storage_button_clicked(self):
         """user clicked on the "Add more storage" button."""
 
+        # pylint: disable=W0702
         try:
             credtool = CredentialsManagementTool()
             creds = yield credtool.find_credentials()
         except:
             logger.exception('Error while trying to update que quota:')
+            creds = {}
 
         if creds:
             signed_url = sign_url(
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-12 00:46:00 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-15 21:44:23 +0000
@@ -350,7 +350,6 @@
     def test_start_control_panel_frozen(self):
         """When frozen, the control-panel has a path."""
         gui.AreYouSure.result = 0
-        help(self.patch)
         # I can't patch sys because frozen is not there by default
         gui.sys.frozen = True
         self.patch(gui.subprocess, "Popen", self._set_called)
@@ -558,7 +557,8 @@
 class FakeCPBackend(object):
     """Fake Control Panel backend."""
 
-    def account_info(*args):
+    def account_info(self, *args):
+        """Fake account info."""
         return defer.succeed({"quota_total": 1000})
 
 
@@ -906,3 +906,48 @@
         self.assertEqual(
             True,
             self.ui.sideWidget().ui.states_frame.isVisible())
+
+
+class FakeFailingCredentialsManagementTool(object):
+
+    """A fake CredentialsManagementTool that fails."""
+
+    def find_credentials(self):
+        """Return a deferred that never triggers callback."""
+        return defer.fail(Exception())
+
+
+class CredsFailureMainWindowTestCase(BaseTestCase):
+    """Test the qt main window."""
+
+    class_ui = gui.MainWindow
+
+    def setUp(self):
+        """Initialize this test instance."""
+        # Faking each SSO object instead of doing it lower
+        # so we don't rely on any SSO behaviour
+        self.patch(gui, "SetUpAccountController", FakeController)
+        self.patch(gui, "TosController", FakeController)
+        self.patch(gui, "EmailVerificationController", FakeController)
+        self.patch(gui, "CurrentUserController", FakeController)
+        self.patch(gui, "SuccessController", FakeController)
+        self.patch(gui, "ForgottenPasswordController", FakeController)
+        self.patch(gui, "ResetPasswordController", FakeController)
+        self.patch(gui, "AreYouSure", FakeAreYouSure)
+        self.patch(gui, "LoadingOverlay", FakeOverlay)
+        self.patch(gui, "LocalFoldersPage", FakeLocalFoldersPage)
+        self.patch(qt.preferences, "PreferencesPanel", FakePreferencesPanel)
+        self.patch(qt.folders, "FoldersPanel", FakeFoldersPanel)
+        self.patch(gui.QtGui.QMessageBox, "critical", self._set_called)
+        self.patch(gui, "CredentialsManagementTool",
+            FakeFailingCredentialsManagementTool)
+        super(CredsFailureMainWindowTestCase, self).setUp()
+
+    def test_overlay_hiding(self):
+        """Credential errors should make the overlay hide."""
+        self.assertEqual(self.ui.overlay.hide_counter, 1)
+
+    def test_critical(self):
+        """Credential errors should display a critical message."""
+        self.assertEqual(self._called, ((self.ui, 'Error getting credentials',
+  "Application will close.\n\nException()"), {}))