Merge lp:~nataliabidart/ubuntuone-windows-installer/import-qt4reactor into lp:ubuntuone-windows-installer

[Natalia Bidart]

- Import qt4reactor properly (LP: #888722).

This also allows us to run the wizard from Linux (is not functional, but the UI is shown if you don't have U1 credentials):

PYTHONPATH=../../controlpanel/trunk/:../../ussoc/trunk/:. bin/ubuntuone-installer-qt

(you will get a
  File "/home/nessita/canonical/ussoc/trunk/ubuntu_sso/main/linux.py", line 412, in get_sso_login_backend
    raise NotImplementedError()
which will be fixed later in the cycle)

[lp:~nataliabidart/ubuntuone-windows-installer/import-qt4reactor]

88. By Natalia Bidart on 2011-11-11

- Import qt4reactor properly (LP: #888722).

89. By Natalia Bidart on 2011-11-11

Forgotten file.

90. By Natalia Bidart on 2011-11-11

No more tests for main (all the logic is in utils).

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

Tested IRL under oneiric: works as advertised.
All tests pass under oneiric too.
Nice branch!

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/main/__init__.py'
--- ubuntuone_installer/gui/qt/main/__init__.py	2011-06-21 15:41:55 +0000
+++ ubuntuone_installer/gui/qt/main/__init__.py	2011-11-11 19:41:25 +0000
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Manuel de la Pena <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -15,16 +13,48 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """Provide the correct reactor and ui integration."""
 
 import sys
 
-# pylint: disable=C0103
-main = None
-
+from PyQt4 import QtGui
+
+# Module used to include the resources into this file
+# Unused import images_rc, pylint: disable=W0611
+from ubuntuone_installer.gui.qt.ui import images_rc
+# pylint: enable=W0611
+
+
+# Invalid name "source", pylint: disable=C0103
 if sys.platform == 'win32':
     from ubuntuone_installer.gui.qt.main import windows
-    main = windows.main
+    source = windows
 else:
     from ubuntuone_installer.gui.qt.main import linux
-    main = linux.main
+    source = linux
+# pylint: enable=C0103
+
+
+def main(installing=False):
+    """Start the Qt reactor and open the main window."""
+    # The following cannot be imported outside this function
+    # because u1trial already provides a reactor.
+
+    # The main loop MUST be initialized before importing the reactor
+    app = QtGui.QApplication(sys.argv)
+    source.main(app)
+
+    # Reimport 'qt4reactor', 'reactor', pylint: disable=W0404
+    import qt4reactor
+    qt4reactor.install()
+
+    from twisted.internet import reactor
+    from ubuntuone_installer.gui.qt.utils import check_credentials
+    # pylint: enable=W0404
+
+    # Module 'reactor' has no 'run'/'stop' member, pylint: disable=E1101
+    reactor.callWhenRunning(check_credentials,
+                            installing=installing, stop_cb=reactor.stop)
+    reactor.run()
+    # pylint: enable=E1101

=== modified file 'ubuntuone_installer/gui/qt/main/linux.py'
--- ubuntuone_installer/gui/qt/main/linux.py	2011-06-27 09:59:34 +0000
+++ ubuntuone_installer/gui/qt/main/linux.py	2011-11-11 19:41:25 +0000
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Manuel de la Pena <[e-mail]>
-# Authors: Alejandro J. Cura <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -16,36 +13,18 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """Main method to be used on linux."""
 
-import sys
-
 from dbus.mainloop.qt import DBusQtMainLoop
-from PyQt4 import Qt
-
-from ubuntuone_installer.gui.qt.gui import MainWindow
-
-
-def main():
-    """Start the Qt reactor and open the main window."""
-
+from PyQt4 import QtCore
+
+
+def main(app):
+    """Apply style sheet."""
     # The DBus main loop MUST be initialized before importing the reactor
     DBusQtMainLoop(set_as_default=True)
 
-    # The app variable should be in scope of the reactor.run()
-    # pylint: disable=W0612
-    Qt.QApplication(sys.argv)
-
-    # The following cannot be imported outside this function
-    # because u1trial already provides a reactor.
-    # pylint: disable=W0404, F0401
-    from qtreactor import qt4reactor
-    qt4reactor.install()
-    from twisted.internet import reactor
-
-    # pylint believes that reactor has no run nor stop methods. Silence it.
-    # pylint: disable=E1101
-    window = MainWindow(close_callback=reactor.stop)
-    window.show()
-
-    reactor.run()
+    # Apply Style Sheet -- The linux version may be different
+    qss = QtCore.QResource(":/ubuntuone.qss")
+    app.setStyleSheet(qss.data())

=== removed directory 'ubuntuone_installer/gui/qt/main/tests'
=== removed file 'ubuntuone_installer/gui/qt/main/tests/__init__.py'
--- ubuntuone_installer/gui/qt/main/tests/__init__.py	2011-07-14 03:48:51 +0000
+++ ubuntuone_installer/gui/qt/main/tests/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: 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/>.
-
-"""The test suite for the Qt UI of the Ubuntu One Installer."""

=== removed file 'ubuntuone_installer/gui/qt/main/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/main/tests/test_windows.py	2011-10-21 15:49:09 +0000
+++ ubuntuone_installer/gui/qt/main/tests/test_windows.py	1970-01-01 00:00:00 +0000
@@ -1,156 +0,0 @@
-# -*- 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.main import windows
-from ubuntuone_installer.tests import TestCase
-
-
-class FakeLogger(object):
-
-    """Fake Logger."""
-
-    error_args = None
-    debug_args = None
-    info_args = None
-
-    def error(self, *args, **kwargs):
-        """Save the error."""
-        self.error_args = (args, kwargs)
-
-    def debug(self, *args, **kwargs):
-        """Save the debug."""
-        self.debug_args = (args, kwargs)
-
-    def info(self, *args, **kwargs):
-        """Save the info."""
-        self.info_args = (args, kwargs)
-
-
-class FakeGui(object):
-    """Fake gui module."""
-
-    def __init__(self):
-        """Create a new instance."""
-        self.main_window = None
-        self.close = None
-        self.installing = False
-        self.called = []
-
-    # pylint: disable=C0103
-    def MainWindow(self, close_callback=lambda: None, installing=False):
-        """Fake main window creation."""
-        self.close = close_callback
-        self.installing = installing
-        self.called.append('MainWindow')
-        return self.main_window
-    # pylint: enable=C0103
-
-
-class FakeWindow(object):
-    """Fake a window."""
-
-    def __init__(self):
-        """Create a new instance."""
-        self.shown = False
-
-    def show(self):
-        """Fake a shown window."""
-        self.shown = True
-
-
-class SuccessTestCase(TestCase):
-    """Test the success callback."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        """Set up the diff tests."""
-        yield super(SuccessTestCase, self).setUp()
-        self.called = []
-        self.start_name = 'start'
-        self.update_name = 'update'
-        self.stop_name = 'stop'
-        self.gui = FakeGui()
-        self.gui.main_window = FakeWindow()
-        self.logger = FakeLogger()
-
-        def fake_start(with_icon=False):
-            """Fake the control panel start."""
-            self.called.append((self.start_name, with_icon))
-            return defer.succeed(None)
-
-        def fake_check_updates(gui, logger):
-            """Fake the check of updates."""
-            self.called.append((self.update_name, gui, logger))
-            return defer.succeed(None)
-
-        def fake_stop():
-            """Fake stop."""
-            self.called.append((self.stop_name,))
-
-        self.patch(windows, 'stop', fake_stop)
-        self.start_cb = fake_start
-        self.check_updates_cb = fake_check_updates
-
-    @defer.inlineCallbacks
-    def test_success_with_creds(self):
-        """Test the success callback with creds."""
-        yield windows.success_cb('creds', self.gui, False, self.logger,
-                                 self.start_cb, self.check_updates_cb)
-        self.assertEqual(self.start_name, self.called[0][0])
-        self.assertFalse(self.called[0][1])
-        self.assertEqual(self.update_name, self.called[1][0])
-        self.assertEqual(self.gui, self.called[1][1])
-        self.assertEqual(self.logger, self.called[1][2])
-        self.assertEqual(self.stop_name, self.called[2][0])
-        self.assertEqual(0, len(self.gui.called))
-
-    @defer.inlineCallbacks
-    def test_success_not_creds(self):
-        """Test the success callback with no creds."""
-        yield windows.success_cb(None, self.gui, True, self.logger,
-                                 self.start_cb, self.check_updates_cb)
-        self.assertTrue('MainWindow' in self.gui.called)
-        self.assertTrue(self.gui.main_window.shown)
-
-
-class ErrorTestCase(TestCase):
-    """Test the success callback."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        """Set up the diff tests."""
-        yield super(ErrorTestCase, self).setUp()
-        self.called = []
-        self.stop_name = 'stop'
-        self.logger = FakeLogger()
-
-        def fake_stop():
-            """Fake stop."""
-            self.called.append(self.stop_name)
-
-        self.patch(windows, 'stop', fake_stop)
-
-    def test_stop(self):
-        """Test the error_cb"""
-        windows.error_cb(Exception('test'), self.logger)
-        self.assertTrue(self.stop_name in self.called)

=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-10-24 12:39:07 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-11-11 19:41:25 +0000
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Manuel de la Pena <[e-mail]>
-#          Roberto Alsina <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -16,76 +13,21 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""Reactor installation for windows."""
-
-# pylint: disable=E1101, F0401, W0404
-
-import sys
+
+"""Main method to be used on windows."""
 
 from PyQt4 import QtGui, QtCore
-from twisted.internet import defer
-
-# Module used to include the resources into this file
-# pylint: disable=W0611
-from ubuntuone_installer.gui.qt.ui import images_rc
-# pylint: enable=W0611
-
-
-def stop(*args):
-    """End the process."""
-    from twisted.internet import reactor
-    reactor.stop()
-
-
-def error_cb(exc, logger):
-    """Handle credentials errors."""
-    logger.error(
-    'Error while getting the credentials: %r', exc)
-    stop()
-
-
[e-mail]
-def success_cb(creds, gui, installing, logger, start_control_panel,
-               check_updates):
-    """Handle credentials success."""
-    logger.debug('Got back from sso.')
-    if creds:  # Have credentials already
-        logger.debug('Already got credentials.')
-        logger.info('Starting control panel.')
-        start_control_panel(with_icon=False)
-        logger.info('Checking updates.')
-        yield check_updates(gui, logger)
-        logger.info('Stopping.')
-        stop()
-    else:  # No credentials
-        logger.debug('Did got connections.')
-        window = gui.MainWindow(close_callback=stop, installing=installing)
-        # 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()
-
-
-def main(installing=False):
-    """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 import gui
-    from twisted.internet import reactor
-    # All this has to be imported here because it installs a reactor
-    from ubuntuone_installer.logger import setup_logging
-    from ubuntuone_installer.gui.qt.utils import check_credentials
-
-    logger = setup_logging('qt.gui')
-    check_credentials(gui, logger, success_cb,
-                      error_cb, installing)
-    reactor.run()
+
+
+def main(app):
+    """Apply style sheet and fonts."""
+    # 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"))
+
+    # Apply Style Sheet -- The windows version may be different
+    qss = QtCore.QResource(":/ubuntuone.qss")
+    app.setStyleSheet(qss.data())

=== modified file 'ubuntuone_installer/gui/qt/utils/__init__.py'
--- ubuntuone_installer/gui/qt/utils/__init__.py	2011-10-20 14:17:13 +0000
+++ ubuntuone_installer/gui/qt/utils/__init__.py	2011-11-11 19:41:25 +0000
@@ -18,9 +18,17 @@
 
 """Utils Functions Platform specific."""
 
-
 import sys
 
+from ubuntuone.platform.credentials import CredentialsManagementTool
+from twisted.internet import defer
+
+from ubuntuone_installer.logger import setup_logging
+
+
+logger = setup_logging('qt.utils')
+
+
 # pylint: disable=C0103
 if sys.platform == 'win32':
     from ubuntuone_installer.gui.qt.utils import windows
@@ -34,7 +42,6 @@
     uninstall_old_beta = windows.uninstall_old_beta
     migrate_old_data = windows.migrate_old_data
     check_updates = windows.check_updates
-    check_credentials = windows.check_credentials
 else:
     from ubuntuone_installer.gui.qt.utils import linux
     uninstall_application = linux.uninstall_application
@@ -47,4 +54,29 @@
     uninstall_old_beta = lambda *args, **kwargs: None
     migrate_old_data = lambda *args, **kwargs: None
     check_updates = lambda *args, **kwargs: None
-    check_credentials = lambda *args, **kwargs: None
+# pylint: enable=C0103
+
+
[e-mail]
+def check_credentials(stop_cb, installing):
+    """Check credentials and either start u1cp or show the wizard."""
+    credtool = CredentialsManagementTool()
+    try:
+        creds = yield credtool.find_credentials()
+    except:  # pylint: disable=W0702
+        logger.exception('Error while getting the credentials:')
+        stop_cb()
+    else:
+        from ubuntuone_installer.gui.qt import gui  # pylint: disable=W0404
+        if creds:  # Have credentials already
+            logger.info('Got credentials! starting controlpanel.')
+            start_control_panel(with_icon=False)
+            logger.info('Checking updates')
+            yield check_updates(gui)
+            logger.info('Updates checked, stopping.')
+            stop_cb()
+        else:  # No credentials
+            logger.info('Got empty credentials, starting wizard app.')
+            window = gui.MainWindow(close_callback=stop_cb,
+                                    installing=installing)
+            window.show()

=== modified file 'ubuntuone_installer/gui/qt/utils/linux.py'
--- ubuntuone_installer/gui/qt/utils/linux.py	2011-09-15 19:33:35 +0000
+++ ubuntuone_installer/gui/qt/utils/linux.py	2011-11-11 19:41:25 +0000
@@ -27,7 +27,7 @@
     pass
 
 
-def start_control_panel():
+def start_control_panel(with_icon=False):
     """Start the control panel."""
     subprocess.Popen(["ubuntuone-control-panel-qt"])
 

=== added file 'ubuntuone_installer/gui/qt/utils/tests/test_common.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_common.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_common.py	2011-11-11 19:41:25 +0000
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+#
+# 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 multiplatform functions."""
+
+import logging
+
+from twisted.internet import defer
+from ubuntuone.devtools.handlers import MementoHandler
+
+from ubuntuone_installer.gui.qt import utils, gui
+from ubuntuone_installer.gui.qt.tests import BaseTestCase
+
+
+class FakeCredsManagementTool(object):
+    """Fake a creds management tool."""
+
+    raise_error = None
+    credentials = None
+
+    def find_credentials(self):
+        """Fake find credentials."""
+        if FakeCredsManagementTool.raise_error is not None:
+            return defer.fail(FakeCredsManagementTool.raise_error)
+        else:
+            return defer.succeed(FakeCredsManagementTool.credentials)
+
+
+class FakeWindow(object):
+    """Fake a windows."""
+
+    args = None
+    visible = False
+
+    def __init__(self, *a, **kw):
+        FakeWindow.args = (a, kw)
+        self.show = lambda: setattr(FakeWindow, 'visible', True)
+
+
+class CheckCredentialsTestCase(BaseTestCase):
+    """Test the code that is used to check the credentials."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set the different tests."""
+        yield super(CheckCredentialsTestCase, self).setUp()
+        self.called = []
+        self.patch(utils, 'CredentialsManagementTool', FakeCredsManagementTool)
+
+        self.memento = MementoHandler()
+        self.memento.setLevel(logging.DEBUG)
+        utils.logger.addHandler(self.memento)
+        self.addCleanup(utils.logger.removeHandler, self.memento)
+
+        self.stop_cb = lambda: self.called.append('stop_cb')
+
+        self.start_cp = lambda with_icon: \
+                        self.called.extend(('start_cp', with_icon))
+        self.patch(utils, 'start_control_panel', self.start_cp)
+
+        self.check_updates = lambda _: self.called.append('check_updates')
+        self.patch(utils, 'check_updates', self.check_updates)
+
+        self.patch(gui, 'MainWindow', FakeWindow)
+
+    @defer.inlineCallbacks
+    def test_check_credentials_failure(self):
+        """Test when the credtool fail."""
+        exc = ValueError('foo')
+        self.patch(FakeCredsManagementTool, 'raise_error', exc)
+        yield utils.check_credentials(stop_cb=self.stop_cb, installing=False)
+
+        self.assertEqual(self.called, ['stop_cb'])
+        self.assertTrue(self.memento.check_exception(exc.__class__, 'foo'))
+
+    @defer.inlineCallbacks
+    def test_check_credentials_present(self):
+        """Test when creds are present."""
+        self.patch(FakeCredsManagementTool, 'credentials', {'foo': 'bar'})
+        yield utils.check_credentials(stop_cb=self.stop_cb, installing=False)
+
+        self.assertEqual(self.called, ['start_cp', False,
+                                       'check_updates', 'stop_cb'])
+        msgs = ('Got credentials! starting controlpanel.', 'Checking updates',
+                'Updates checked, stopping.')
+        for msg in msgs:
+            self.assertTrue(self.memento.check_info(msg))
+
+    @defer.inlineCallbacks
+    def test_check_credentials_not_present(self):
+        """Test when creds are present."""
+        self.patch(FakeCredsManagementTool, 'credentials', {})
+        yield utils.check_credentials(stop_cb=self.stop_cb, installing=False)
+
+        kw = dict(close_callback=self.stop_cb, installing=False)
+        self.assertEqual(FakeWindow.args, ((), kw))
+        self.assertTrue(FakeWindow.visible)
+        msgs = ('Got empty credentials', 'starting wizard')
+        self.assertTrue(self.memento.check_info(*msgs))

=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-10-28 11:00:42 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-11-11 19:41:25 +0000
@@ -469,22 +469,6 @@
         self.assertEqual(0, len(self.called_paths))
 
 
-class FakeLogger(object):
-    """A Fake logging object."""
-
-    def __init__(self):
-        """Create a new instance."""
-        self.called_methods = []
-
-    def info(self, message, *args, **kwargs):
-        """Set an info log message."""
-        self.called_methods.append(('info', message, args, kwargs))
-
-    def debug(self, message, *args, **kwargs):
-        """Set a debug log message."""
-        self.called_methods.append(('debug', message, args, kwargs))
-
-
 class AutoupdaterTestCase(BaseTestCase):
     """Test the code that is used for the auto update process."""
 
@@ -503,7 +487,6 @@
             self.args = args
             return self.return_from_call
 
-        self.fake_logger = FakeLogger()
         self.patch(utils.windows, 'getProcessValue', fake_execute_process)
         self.patch(utils.windows, '_get_update_path',
                    lambda: self.auto_update_path)
@@ -515,7 +498,7 @@
         # the fake call, assert that we get true and also that
         # we did use the correct parameters.
         self.return_from_call = 0
-        are_present = yield utils.are_updates_present(self.fake_logger)
+        are_present = yield utils.are_updates_present()
         self.assertTrue(are_present, 'Updates should be present.')
         # lets assert that we did use the correct args
         expected_args = ('--mode', 'unattended')
@@ -527,7 +510,7 @@
         """Test when updates are not present."""
         # similar to test_are_updates_present_true but with diff retcode
         self.return_from_call = 40
-        are_present = yield utils.are_updates_present(self.fake_logger)
+        are_present = yield utils.are_updates_present()
         self.assertFalse(are_present, 'Updates should NOT be present.')
         # lets assert that we did use the correct args
         expected_args = ('--mode', 'unattended')
@@ -557,10 +540,9 @@
         yield super(CheckUpdatesTestCase, self).setUp()
         self.are_present = False
         self.user_wants_update = False
-        self.logger = FakeLogger()
         self.called = []
 
-        def fake_are_present(logger):
+        def fake_are_present():
             """Fake are updates present."""
             self.called.append('are_updates_present')
             return self.are_present
@@ -582,7 +564,7 @@
     def test_check_updates_not_present(self):
         """Test the method that interacts with the user."""
         self.are_present = False
-        yield utils.check_updates(gui, self.logger)
+        yield utils.check_updates(gui)
         self.assertTrue('are_updates_present' in self.called)
         self.assertFalse('perform_update' in self.called)
 
@@ -591,7 +573,7 @@
         """Test the method that interacts with the user."""
         self.are_present = True
         self.user_wants_update = False
-        yield utils.check_updates(gui, self.logger)
+        yield utils.check_updates(gui)
         self.assertTrue('are_updates_present' in self.called)
         self.assertTrue('user_wants_to_update' in self.called)
         self.assertFalse('perform_update' in self.called)
@@ -601,69 +583,7 @@
         """Test the method that interacts with the user."""
         self.are_present = True
         self.user_wants_update = True
-        yield utils.check_updates(gui, self.logger)
+        yield utils.check_updates(gui)
         self.assertTrue('are_updates_present' in self.called)
         self.assertTrue('user_wants_to_update' in self.called)
         self.assertTrue('perform_update' in self.called)
-
-
-class FakeCredsManagementTool(object):
-    """Fake a creds management tool."""
-
-    raise_error = False
-    credentials = None
-
-    def __init__(self):
-        """Create a new instance."""
-
-    def find_credentials(self):
-        """Fake find credentials."""
-        if FakeCredsManagementTool.raise_error:
-            return defer.fail(Exception('Test!'))
-        else:
-            return defer.succeed(FakeCredsManagementTool.credentials)
-
-
-class CheckCredentialsTestCase(BaseTestCase):
-    """Test the code that is used to check the credentials."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        """Set the different tests."""
-        yield super(CheckCredentialsTestCase, self).setUp()
-        self.logger = FakeLogger()
-        self.called = []
-
-        def success(creds, gui_ref, installing, logger, start_control_panel,
-                       check_updates):
-            """Success cb."""
-            self.called.append(('success', creds, gui_ref, installing, logger,
-                                start_control_panel, check_updates))
-
-        def error(exc, logger):
-            """Error cb."""
-            self.called.append(('error', exc, logger))
-
-        self.success_cb = success
-        self.error_cb = error
-        self.patch(utils.windows, 'CredentialsManagementTool',
-                   FakeCredsManagementTool)
-
-    @defer.inlineCallbacks
-    def test_check_credentials_not_present(self):
-        """Test when creds are not present."""
-        FakeCredsManagementTool.raise_error = True
-        yield utils.check_credentials(gui, self.logger, self.success_cb,
-                                self.error_cb)
-        self.assertTrue('error' in self.called[0])
-
-    @defer.inlineCallbacks
-    def test_check_credentials_present(self):
-        """Test when creds are present."""
-        FakeCredsManagementTool.raise_error = False
-        FakeCredsManagementTool.credentials = 'creds'
-        yield utils.check_credentials(gui, self.logger, self.success_cb,
-                                self.error_cb)
-        self.assertTrue('success' in self.called[0])
-        self.assertEqual(FakeCredsManagementTool.credentials,
-                         self.called[0][1])

=== modified file 'ubuntuone_installer/gui/qt/utils/windows.py'
--- ubuntuone_installer/gui/qt/utils/windows.py	2011-11-08 12:52:10 +0000
+++ ubuntuone_installer/gui/qt/utils/windows.py	2011-11-11 19:41:25 +0000
@@ -42,7 +42,10 @@
 from ubuntuone.platform import tools
 # pylint: enable=E0611
 
-from ubuntuone.platform.credentials import CredentialsManagementTool
+from ubuntuone_installer.logger import setup_logging
+
+
+logger = setup_logging('qt.utils.windows')
 
 AUTORUN_KEY = r"Software\Microsoft\Windows\CurrentVersion\Run"
 
@@ -102,22 +105,7 @@
 
 
 @defer.inlineCallbacks
-def check_credentials(gui, logger, success_cb, error_cb,
-                      installer=False):
-    """Check credentials and either start u1cp or show the wizard."""
-    credtool = CredentialsManagementTool()
-    # pylint: disable=W0703
-    try:
-        creds = yield credtool.find_credentials()
-    except Exception, exc:
-        error_cb(exc, logger)
-    else:
-        yield success_cb(creds, gui, installer, logger, start_control_panel,
-                         check_updates)
-
-
[e-mail]
-def are_updates_present(logger):
+def are_updates_present():
     """Return if there are updates for Ubuntu One."""
     update_path = _get_update_path()
     logger.debug('Update path %s', update_path)
@@ -145,12 +133,12 @@
 
 
 @defer.inlineCallbacks
-def check_updates(gui, logger):
+def check_updates(gui):
     """Check for updates."""
     logger.info('Checking for updates.')
     # the idea is simple, check if there are updates, ask user if we perform
     # the update and continue.
-    are_present = yield are_updates_present(logger)
+    are_present = yield are_updates_present()
     logger.debug('Updates present: %r', are_updates_present)
     if are_present:
         logger.info('Updates are present.')