Merge lp:~dobey/ubuntuone-control-panel/update-from-trunk into lp:ubuntuone-control-panel/stable-3-0

[dobey]

[Diego Sarmentero]

  - Restarting the wizard on current device removed.

[Natalia Bidart]

  - Check for updates when the main window is shown. On linux, this is a no-op.
    On windows, this will check for new versions of the software and will
    prompt the user for confirmation to install updates.
  - Make the LOADING_OVERLAY_MARKUP use a smaller font.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-03-29 16:56:35 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-04-11 01:13:24 +0000
@@ -247,6 +247,10 @@
 VALUE_ERROR = _('Value could not be retrieved.')
 UNKNOWN_ERROR = _('Unknown error')
 USAGE_LABEL = _('%(used)s of %(total)s')
+# TODO: mark the following strings translatable after precise is released
+UPDATE_TITLE = APP_NAME
+UPDATE_SOFTWARE = ('There is a new update available.'
+                   ' Would you like to install it?')
 QUIT_LABEL = _('Quit Ubuntu One')
 
 # pylint: enable=E0602

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-03-30 17:34:33 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-04-11 01:13:24 +0000
@@ -93,6 +93,7 @@
     @log_call(logger.debug)
     def on_credentials_not_found(self):
         """Credentials are not found or were removed."""
+        self.ui.wizard.restart()
         self.ui.switcher.setCurrentWidget(self.ui.wizard)
         self.is_processing = False
 

=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-03-29 19:05:02 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-04-11 01:13:24 +0000
@@ -18,9 +18,13 @@
 
 from PyQt4 import QtGui, QtCore
 
+from twisted.internet import defer
+
+from ubuntuone.controlpanel import utils
+from ubuntuone.controlpanel.logger import setup_logging
+from ubuntuone.controlpanel.gui import UPDATE_TITLE, UPDATE_SOFTWARE
 from ubuntuone.controlpanel.gui.qt.systray import TrayIcon
 from ubuntuone.controlpanel.gui.qt.ui import mainwindow_ui
-from ubuntuone.controlpanel.utils import add_to_autostart
 
 # pylint: disable=E0611
 try:
@@ -30,6 +34,8 @@
     USE_LIBUNITY = False
 # pylint: enable=E0611
 
+logger = setup_logging('qt.gui')
+
 U1_DOTDESKTOP = "ubuntuone-installer.desktop"
 
 
@@ -49,7 +55,7 @@
         self.installer = installer
         if installer:
             self.ui.control_panel.start_from_license()
-        add_to_autostart()
+        utils.add_to_autostart()
         if USE_LIBUNITY:
             self.entry = Unity.LauncherEntry.get_for_desktop_id(U1_DOTDESKTOP)
         else:
@@ -87,6 +93,23 @@
 
     # pylint: enable=C0103
 
+    @defer.inlineCallbacks
+    def check_updates(self):
+        """Offer the user to update if there are updates available."""
+        logger.debug('Checking for updates.')
+        are_present = yield utils.are_updates_present()
+        logger.info('Updates available? %r', are_present)
+        if are_present:
+            buttons = QtGui.QMessageBox.Yes | QtGui.QMessageBox.No
+            result = QtGui.QMessageBox.question(self, UPDATE_TITLE,
+                                                UPDATE_SOFTWARE,
+                                                buttons, QtGui.QMessageBox.Yes)
+            if result == QtGui.QMessageBox.Yes:
+                logger.info('Performing auto-update.')
+                utils.perform_update()
+            else:
+                logger.info('User do not want to update.')
+
 
 def start(close_callback, minimized=False, with_icon=False, installer=False):
     """Show the UI elements."""
@@ -102,6 +125,7 @@
                     QtCore.Qt.LeftToRight, QtCore.Qt.AlignCenter,
                     window.size(), app.desktop().availableGeometry())
         window.setGeometry(style)
+        window.check_updates()
         window.show()
     else:
         window = None

=== modified file 'ubuntuone/controlpanel/gui/qt/loadingoverlay.py'
--- ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2012-03-14 20:01:00 +0000
+++ ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2012-04-11 01:13:24 +0000
@@ -23,7 +23,7 @@
 from ubuntuone.controlpanel.gui import LOADING_OVERLAY
 from ubuntuone.controlpanel.gui.qt.ui import loadingoverlay_ui
 
-LOADING_OVERLAY_MARKUP = u'<span style="font-size:xx-large;">{0}</span>'
+LOADING_OVERLAY_MARKUP = u'<span style="font-size:x-large;">{0}</span>'
 
 
 class LoadingOverlay(QtGui.QFrame):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-03-28 12:06:28 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-04-11 01:13:24 +0000
@@ -210,6 +210,13 @@
         cls.kwargs = kw
         return cls.response
 
+    @classmethod
+    def question(cls, *a, **kw):
+        """Simulate a question message."""
+        cls.args = a
+        cls.kwargs = kw
+        return cls.response
+
     # Invalid name "setDetailedText", "setDefaultButton"
     # pylint: disable=C0103
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-03-26 21:00:47 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-04-11 01:13:24 +0000
@@ -68,9 +68,11 @@
 
     def test_on_credentials_not_found(self):
         """The wizard panel is shown."""
+        self.patch(self.ui.ui.wizard, 'restart', self._set_called)
         self.ui.on_credentials_found()
         self.ui.on_credentials_not_found()
         self.assertIs(self.ui.ui.switcher.currentWidget(), self.ui.ui.wizard)
+        self.assertEqual(self._called, ((), {}))
 
     @defer.inlineCallbacks
     def test_on_credentials_found_called(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-03-26 13:30:07 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-04-11 01:13:24 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 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
@@ -21,7 +19,7 @@
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.qt import gui
-from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
+from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase, FakedDialog
 
 
 class FakeEntry(object):
@@ -119,13 +117,86 @@
         self.assertEqual(entry.called, (('urgent', "foo"), {}))
 
 
+class CheckUpdatesNoUpdatesTestCase(MainWindowTestCase):
+    """Test the check_updates method when there are no updates."""
+
+    updates_available = False
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set the different tests."""
+        yield super(CheckUpdatesNoUpdatesTestCase, self).setUp()
+        self.patch(gui.utils, 'are_updates_present',
+                   lambda: defer.succeed(self.updates_available))
+        self.patch(gui.utils, 'perform_update',
+                   lambda: defer.fail(ValueError()))
+
+    @defer.inlineCallbacks
+    def test_update_confirmation_dialog(self):
+        """The confirmation dialog is not shown."""
+        yield self.ui.check_updates()
+        self.assertEqual(None, FakedDialog.args)
+        self.assertEqual(None, FakedDialog.kwargs)
+
+    @defer.inlineCallbacks
+    def test_perform_update(self):
+        """The perform_update method is not called."""
+        yield self.ui.check_updates()
+        self.assertFalse(self._called)
+
+
+class CheckUpdatesUserSaysNoTestCase(CheckUpdatesNoUpdatesTestCase):
+    """Test check_updates when there are updates and user rejects them."""
+
+    updates_available = True
+    user_response = gui.QtGui.QMessageBox.No
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set the different tests."""
+        yield super(CheckUpdatesUserSaysNoTestCase, self).setUp()
+        self.patch(FakedDialog, 'response', self.user_response)
+
+    @defer.inlineCallbacks
+    def test_update_confirmation_dialog(self):
+        """The confirmation dialog is shown with correct params."""
+        yield self.ui.check_updates()
+        args = (self.ui, gui.UPDATE_TITLE, gui.UPDATE_SOFTWARE,
+                gui.QtGui.QMessageBox.Yes | gui.QtGui.QMessageBox.No,
+                gui.QtGui.QMessageBox.Yes)
+        self.assertEqual(args, FakedDialog.args)
+        self.assertEqual({}, FakedDialog.kwargs)
+
+
+class CheckUpdatesUserSaysYesTestCase(CheckUpdatesUserSaysNoTestCase):
+    """Test check_updates when there are updates and user accepts them."""
+
+    user_response = gui.QtGui.QMessageBox.Yes
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set the different tests."""
+        self.updated = defer.Deferred()
+        yield super(CheckUpdatesUserSaysYesTestCase, self).setUp()
+        self.patch(gui.utils, 'perform_update',
+                   lambda *a, **kw: self.updated.callback((a, kw)))
+
+    @defer.inlineCallbacks
+    def test_perform_update(self):
+        """The perform_update method is called."""
+        yield self.ui.check_updates()
+        result = yield self.updated  # perform_update will fire this deferred
+
+        self.assertEqual(result, ((), {}))
+
+
 class AutoStartTestCase(MainWindowTestCase):
     """Test the add_to_autostart call."""
 
     @defer.inlineCallbacks
     def setUp(self):
         # Be sure to patch add_to_autostart *before* class_ui creation occurs.
-        self.patch(gui, "add_to_autostart", self._set_called)
+        self.patch(gui.utils, "add_to_autostart", self._set_called)
         yield super(AutoStartTestCase, self).setUp()
 
     def test_add_to_autostart(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_start.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-03-20 19:13:28 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-04-11 01:13:24 +0000
@@ -34,6 +34,7 @@
 
     def __init__(self):
         self.args = []
+        self.updates_checked = defer.Deferred()
 
     def __call__(self, *args, **kwargs):
         self.args.append((args, kwargs))
@@ -50,10 +51,17 @@
         """Save the new geometry."""
         self.style = style
 
+    def check_updates(self):
+        """Fake the check updates call."""
+        self.updates_checked.callback(None)
+        return self.updates_checked
+
 
 class StartTestCase(TestCase):
     """Test the qt control panel."""
 
+    timeout = 2
+
     @defer.inlineCallbacks
     def setUp(self):
         yield super(StartTestCase, self).setUp()
@@ -106,3 +114,12 @@
                         gui.QtCore.Qt.AlignCenter, self.main_window.size(),
                         app.desktop().availableGeometry())
         self.assertEqual(self.main_window.style, expected)
+
+    @defer.inlineCallbacks
+    def test_updates_are_checked(self):
+        """When creating the window, updates are checked."""
+        gui.start(close_callback=self.close_cb)
+
+        # a timeout in this test means that the check_updates method
+        # was not called
+        yield self.main_window.updates_checked