Merge lp:~ralsina/ubuntuone-windows-installer/no-credentials into lp:ubuntuone-windows-installer

[Roberto Alsina]

Start the control panel directly if the user already has credentials.

Start the control panel directly if the user already has credentials.

[lp:~ralsina/ubuntuone-windows-installer/no-credentials]

44. By Roberto Alsina on 2011-08-26

solve merge conflict

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Diego Sarmentero (diegosarmentero)]

"start_control_panel" function should be moved into "utils" (platform dependent) module as the uninstall function, because both are checking if sys.platform == "win32".

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/no-credentials]

45. By Roberto Alsina on 2011-08-29

refactored as suggested by diego

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-08-23 17:43:40 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-08-29 12:42:23 +0000
@@ -59,7 +59,6 @@
 
 from ubuntuone.platform.credentials import (
     APP_NAME,
-    CredentialsManagementTool,
     TC_URL,
 )
 
@@ -90,6 +89,7 @@
 TITLE_STYLE = "<span style=\"font-size:24px\">%s</span>"
 CREDENTIALS_ERROR_TITLE = _("Error getting credentials")
 CREDENTIALS_ERROR = _('Application will close.\n\n%r')
+STARTING_CP_ERROR = _('Error starting Ubuntu One')
 # Invalid name logger
 # pylint: disable=C0103
 logger = setup_logging('qt.gui')
@@ -291,6 +291,7 @@
 
         self.setSideWidget(SideWidget())
         self.overlay = LoadingOverlay(self)
+        self.overlay.hide()
 
         self.setOption(self.NoBackButtonOnStartPage, True)
 
@@ -388,30 +389,9 @@
         # Set Wizard buttons style
         self.button(QtGui.QWizard.NextButton).setDefault(True)
 
-        credtool = CredentialsManagementTool()
-        d = credtool.find_credentials()
-        d.addCallback(self.creds_cb)
-        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(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:
-            self.LICENSE_PAGE._next_id = self.local_folders_page_id
-
     def critical(self, message):
         """Show a message at the bottom of the page on form errors."""
         self.overlay.hide()
@@ -451,15 +431,7 @@
         """The main window is being closed, call any custom callback."""
         # Finished, not cancelled
         if result == 1:  # Cancelled
-            # If we are in windows and "frozen", assume it's in
-            # the same folder as this .exe
-            if sys.platform == "win32" and hasattr(sys, "frozen"):
-                cp_path = os.path.join(os.path.dirname(
-                    os.path.abspath(sys.executable)),
-                    "ubuntuone-control-panel-qt.exe")
-            else:
-                cp_path = "ubuntuone-control-panel-qt"
-            subprocess.Popen([cp_path, ])
+            utils.start_control_panel()
         elif self.currentId() == self.LICENSE_PAGE_ID:
             if not AreYouSure(self).exec_():
                 utils.uninstall_application()
 
=== added file 'ubuntuone_installer/gui/qt/main/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/main/tests/test_windows.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/main/tests/test_windows.py	2011-08-29 12:42:23 +0000
@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Alejandro J. Cura <[e-mail]>
+#          Roberto Alsina <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the Windows main."""
+
+from twisted.internet import defer
+
+from ubuntuone_installer.gui.qt import gui, utils
+from ubuntuone_installer.gui.qt.main import windows
+from ubuntuone_installer.gui.qt.tests.test_gui import FakeMainWindow
+from ubuntuone_installer.tests import TestCase
+
+
+class FakeFailingCredentialsManagementTool(object):
+
+    """A fake CredentialsManagementTool that fails."""
+
+    def find_credentials(self):
+        """Return a failure."""
+        return defer.fail(Exception())
+
+
+class FakeNoCredentialsManagementTool(object):
+
+    """A fake CredentialsManagementTool that fakes no credentials."""
+
+    def find_credentials(self):
+        """Return a success, but no credentials."""
+        return defer.succeed({})
+
+
+class FakeCredentialsManagementTool(object):
+
+    """A fake CredentialsManagementTool that fakes credentials."""
+
+    def find_credentials(self):
+        """Return a success, but no credentials."""
+        return defer.succeed("Something not false")
+
+
+class FakeLogger(object):
+
+    """Fake Logger."""
+
+    error_args = None
+
+    def error(self, *args, **kwargs):
+        """Save the error."""
+        self.error_args = (args, kwargs)
+
+
+class CredsFailureMainTestCase(TestCase):
+
+    """Test the qt main window."""
+
+    stopped = False
+
+    def stop(self):
+        """A fake stop."""
+        self.stopped = True
+
+    @defer.inlineCallbacks
+    def test_failure(self):
+        """Credential errors should display a critical message."""
+        logger = FakeLogger()
+        self.patch(windows, 'stop', self.stop)
+        self.stopped = False
+        yield windows.check_credentials(
+            FakeFailingCredentialsManagementTool,
+            gui, logger)
+        # Should log the error
+        self.assertEqual(logger.error_args[0][0],
+            ('Error while getting the credentials: %r'))
+        # Should stop the app
+        self.assertTrue(self.stopped)
+
+    @defer.inlineCallbacks
+    def test_no_creds(self):
+        """No credentials should start the wizard."""
+        logger = FakeLogger()
+        fakemain = FakeMainWindow()
+        self.patch(gui, 'MainWindow', lambda *args, **kwargs: fakemain)
+        self.patch(windows, 'stop', self._set_called)
+        self.assertFalse(fakemain.shown)
+        self.patch(windows, 'stop', self.stop)
+        self.stopped = False
+        yield windows.check_credentials(
+            FakeNoCredentialsManagementTool,
+            gui, logger)
+        # Should show the main window
+        self.assertTrue(fakemain.shown)
+        # Should not log errors
+        self.assertEqual(logger.error_args, None)
+        # Should not stop the app
+        self.assertFalse(self.stopped)
+
+    @defer.inlineCallbacks
+    def test_with_creds(self):
+        """Having credentials should start the control panel."""
+        logger = FakeLogger()
+        self.patch(utils, 'start_control_panel', self._set_called)
+        self.patch(windows, 'stop', self.stop)
+        self.stopped = False
+        yield windows.check_credentials(
+            FakeCredentialsManagementTool,
+            gui, logger)
+        # Should not log errors
+        self.assertEqual(logger.error_args, None)
+        # Should start u1cp
+        self.assertEqual(self._called, ((), {}))
+        # Should stop the app
+        self.assertTrue(self.stopped)
 
=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-08-12 01:07:04 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-08-29 12:42:23 +0000
@@ -21,8 +21,8 @@
 
 import sys
 
-from PyQt4 import QtGui
-from PyQt4 import QtCore
+from PyQt4 import QtGui, QtCore
+from twisted.internet import defer
 
 # Module used to include the resources into this file
 # pylint: disable=W0611
@@ -36,26 +36,62 @@
     reactor.stop()
 
 
+def error_cb(exc, logger):
+    """Handle credentials errors."""
+    logger.error(
+    'Error while getting the credentials: %r', exc)
+    stop()
+
+
+def success_cb(creds, gui):
+    """Handle credentials success."""
+    if creds:  # Have credentials already
+        try:
+            gui.utils.start_control_panel()
+        except OSError:
+            QtGui.QMessageBox.critical(
+                None, "Ubuntu One", gui.STARTING_CP_ERROR)
+        stop()
+    else:  # No credentials
+        window = gui.MainWindow(close_callback=stop)
+        # Set Application Style Sheet
+        app = QtGui.QApplication.instance()
+        qss = QtCore.QResource(":/ubuntuone.qss")
+        app.setStyleSheet(QtCore.QString(qss.data()))
+        # Apply font to the entire application
+        QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
+        QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
+        # Set Application Icon
+        app.setWindowIcon(QtGui.QIcon(":/ubuntu_one_favicon.png"))
+        window.show()
+
+
[e-mail]
+def check_credentials(credentials_tool, gui, logger):
+    """Check credentials and either start u1cp or show the wizard."""
+    credtool = credentials_tool()
+    # pylint: disable=W0703
+    try:
+        creds = yield credtool.find_credentials()
+    except Exception, exc:
+        error_cb(exc, logger)
+    else:
+        success_cb(creds, gui)
+
+
 def main():
     """Perform a client request to be logged in."""
-
+    # pylint: disable=W0612
     app = QtGui.QApplication(sys.argv)
+    # pylint: enable=W0612
     import qtreactor.qt4reactor
     qtreactor.qt4reactor.install()
-    from ubuntuone_installer.gui.qt.gui import MainWindow
+    from ubuntuone_installer.gui.qt import gui, utils
     from twisted.internet import reactor
-    window = MainWindow(close_callback=stop)
-    app.window = window
-
-    # Set Application Style Sheet
-    app = QtGui.QApplication.instance()
-    qss = QtCore.QResource(":/ubuntuone.qss")
-    app.setStyleSheet(QtCore.QString(qss.data()))
-    # Apply font to the entire application
-    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
-    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
-    # Set Application Icon
-    app.setWindowIcon(QtGui.QIcon(":/ubuntu_one_favicon.png"))
-
-    window.show()
+    # All this has to be imported here because it installs a reactor
+    from ubuntuone.platform.credentials import CredentialsManagementTool
+    from ubuntuone_installer.logger import setup_logging
+    logger = setup_logging('qt.gui')
+
+    check_credentials(CredentialsManagementTool, gui, logger)
     reactor.run()
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-26 12:24:48 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-29 12:42:23 +0000
@@ -31,22 +31,6 @@
 from ubuntuone_installer.gui.qt.tests import BaseTestCase
 
 
-TOKEN = {u'consumer_key': u'xQ7xDAz',
-         u'consumer_secret': u'KzCJWCTNbbntwfyCKKjomJDzlgqxLy',
-         u'token_name': u'test',
-         u'token': u'GkInOfSMGwTXAUoVQwLUoPxElEEUdhsLVNTPhxHJDUIeHCPNEo',
-         u'token_secret': u'qFYImEtlczPbsCnYyuwLoPDlPEnvNcIktZphPQklAWrvyfFMV'}
-
-
-class FakeFailureCredentialsManagementTool(object):
-
-    """A fake CredentialsManagementTool that fails."""
-
-    def find_credentials(self):
-        """Return a deferred that never triggers callback."""
-        return defer.succeed({})
-
-
 class FakeController(object):
 
     """A fake controller for the tests."""
@@ -165,8 +149,6 @@
         self.patch(gui, "LocalFoldersPage", FakeLocalFoldersPage)
         self.patch(qt.preferences, "PreferencesPanel", FakePreferencesPanel)
         self.patch(qt.folders, "FoldersPanel", FakeFoldersPanel)
-        self.patch(gui, "CredentialsManagementTool",
-            FakeFailureCredentialsManagementTool)
         super(MainWindowTestCase, self).setUp()
 
     def test_execute_uninstall_on_licence_cancel(self):
@@ -566,17 +548,6 @@
         QtCore.QCoreApplication.instance().processEvents()
         self.assertEqual(self.ui.result(), self.ui.Rejected)
 
-    def test_license_next(self):
-        """Test what's the license page's nextID."""
-        self.ui.creds_cb("fakecreds")
-        self.assertEqual(self.ui.LICENSE_PAGE.nextId(),
-            self.ui.local_folders_page_id)
-
-    def test_license_next_default(self):
-        """By default, should be the sign in page."""
-        self.assertEqual(self.ui.LICENSE_PAGE.nextId(),
-            self.ui.SIGNIN_PAGE)
-
 
 class FakeSignal(object):
 
@@ -604,50 +575,9 @@
     userCancellation = FakeSignal()
     shown = False
 
+    def __init__(self, close_callback=None):
+        pass
+
     def show(self):
         """Fake method."""
         self.shown = True
-
-
-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, "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.ui.form_errors_label.text(),
-            "Application will close.\n\nException()")
 
=== modified file 'ubuntuone_installer/gui/qt/utils/__init__.py'
--- ubuntuone_installer/gui/qt/utils/__init__.py	2011-08-23 17:27:56 +0000
+++ ubuntuone_installer/gui/qt/utils/__init__.py	2011-08-29 12:42:23 +0000
@@ -21,10 +21,12 @@
 
 import sys
 
-
+# pylint: disable=C0103
 if sys.platform == 'win32':
     from ubuntuone_installer.gui.qt.utils import windows
     uninstall_application = windows.uninstall_application
+    start_control_panel = windows.start_control_panel
 else:
     from ubuntuone_installer.gui.qt.utils import linux
     uninstall_application = linux.uninstall_application
+    start_control_panel = linux.start_control_panel
 
=== modified file 'ubuntuone_installer/gui/qt/utils/linux.py'
--- ubuntuone_installer/gui/qt/utils/linux.py	2011-08-23 17:27:56 +0000
+++ ubuntuone_installer/gui/qt/utils/linux.py	2011-08-29 12:42:23 +0000
@@ -18,7 +18,13 @@
 
 """Utils Functions Linux specific."""
 
+import subprocess
 
 def uninstall_application():
     """Uninstall Ubuntu One."""
     pass
+
+
+def start_control_panel():
+    """Start the control panel."""
+    subprocess.Popen(["ubuntuone-control-panel-qt", ])
 
=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-08-26 18:41:33 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-08-29 12:42:23 +0000
@@ -54,6 +54,6 @@
         self.assertTrue(self._called[0][0] is None)
         self.assertTrue("uninstall.exe" in self._called[0][2])
         self.assertTrue('runas' == self._called[0][1])
-        self.assertTrue('--mode=qt' == self._called[0][3])
+        self.assertTrue('--mode qt' == self._called[0][3])
         self.assertTrue('' == self._called[0][4])
         self.assertTrue(0 == self._called[0][5])
 
=== modified file 'ubuntuone_installer/gui/qt/utils/windows.py'
--- ubuntuone_installer/gui/qt/utils/windows.py	2011-08-26 18:41:33 +0000
+++ ubuntuone_installer/gui/qt/utils/windows.py	2011-08-29 12:42:23 +0000
@@ -19,8 +19,9 @@
 """Utils Functions Windows specific."""
 
 
+import os
+import subprocess
 import sys
-import os
 
 import win32api
 
@@ -36,3 +37,16 @@
     win32api.ShellExecute(None, 'runas',
         uninstall_path,
         '--mode qt', '', 0)
+
+
+def start_control_panel():
+    """Start the control panel."""
+    # If we are in windows and "frozen", assume it's in
+    # the same folder as this .exe
+    if sys.platform == "win32" and hasattr(sys, "frozen"):
+        cp_path = os.path.join(os.path.dirname(
+            os.path.abspath(sys.executable)),
+            "ubuntuone-control-panel-qt.exe")
+    else:
+        cp_path = "ubuntuone-control-panel-qt"
+    subprocess.Popen([cp_path, ])