Merge lp:~mandel/ubuntuone-windows-installer/auto-update-python-only into lp:ubuntuone-windows-installer

[Manuel de la Peña]

Partial fix for lp: 845662

Provides the code that perform a call to the auto-update process that will check for updates and will perform them if the user agrees to do so.

Provides the code that perform a call to the auto-update process that will check for updates and will perform them if the user agrees to do so.

[lp:~mandel/ubuntuone-windows-installer/auto-update-python-only]

72. By Manuel de la Peña on 2011-09-19

Remove named parameter comming from a smart-ass diff.

[Diego Sarmentero (diegosarmentero)]

...
ubuntuone_installer.gui.qt.main.tests.test_windows
  CredsFailureMainTestCase
    test_failure ... [OK]
    test_no_creds ... Traceback (most recent call last):
  File "C:\Python27\lib\site-packages\twisted\internet\defer.py", line 1020, in
_inlineCallbacks
    result = g.send(result)
  File "X:\ubuntuone-windows-installer-mandel\ubuntuone_installer\gui\qt\main\wi
ndows.py", line 85, in check_credentials
    success_cb(creds, gui, installer, logger)
  File "C:\Python27\lib\site-packages\twisted\internet\defer.py", line 1141, in
unwindGenerator
    return _inlineCallbacks(None, f(*args, **kwargs), Deferred())
  File "X:\ubuntuone-windows-installer-mandel\ubuntuone_installer\gui\qt\main\wi
ndows.py", line 50, in success_cb
    logger.debug('Got back from sso.')
exceptions.AttributeError: 'FakeLogger' object has no attribute 'debug'
[ERROR]
    test_with_creds ... Traceback (most recent call last):
  File "C:\Python27\lib\site-packages\twisted\internet\defer.py", line 1020, in
_inlineCallbacks
    result = g.send(result)
  File "X:\ubuntuone-windows-installer-mandel\ubuntuone_installer\gui\qt\main\wi
ndows.py", line 85, in check_credentials
    success_cb(creds, gui, installer, logger)
  File "C:\Python27\lib\site-packages\twisted\internet\defer.py", line 1141, in
unwindGenerator
    return _inlineCallbacks(None, f(*args, **kwargs), Deferred())
  File "X:\ubuntuone-windows-installer-mandel\ubuntuone_installer\gui\qt\main\wi
ndows.py", line 50, in success_cb
    logger.debug('Got back from sso.')
exceptions.AttributeError: 'FakeLogger' object has no attribute 'debug'
[ERROR]
    test_with_installed_flag ... Traceback (most recent call last):
  File "C:\Python27\lib\site-packages\twisted\internet\defer.py", line 1020, in
_inlineCallbacks
    result = g.send(result)
  File "X:\ubuntuone-windows-installer-mandel\ubuntuone_installer\gui\qt\main\te
sts\test_windows.py", line 150, in test_with_installed_flag
    gui, True), {}))
twisted.trial.unittest.FailTest: not equal:
a = (('Something not false',
  <module 'ubuntuone_installer.gui.qt.gui' from 'X:\ubuntuone-windows-installer-
mandel\ubuntuone_installer\gui\qt\gui.pyc'>,
  True,
  <ubuntuone_installer.gui.qt.main.tests.test_windows.FakeLogger object at 0x086
9D3B0>),
 {})
b = (('Something not false',
  <module 'ubuntuone_installer.gui.qt.gui' from 'X:\ubuntuone-windows-installer-
mandel\ubuntuone_installer\gui\qt\gui.pyc'>,
  True),
 {})

[FAIL]
    test_without_installed_flag ... Traceback (most recent call last):
  File "C:\Python27\lib\site-packages\twisted\internet\defer.py", line 1020, in
_inlineCallbacks
    result = g.send(result)
  File "X:\ubuntuone-windows-installer-mandel\ubuntuone_installer\gui\qt\main\te
sts\test_windows.py", line 139, in test_without_installed_flag
    gui, False), {}))
twisted.trial.unittest.FailTest: not equal:
a = (('Something not false',
  <module 'ubuntuone_installer.gui.qt.gui' from 'X:\ubuntuone-windows-installer-
mandel\ubuntuone_installer\gui\qt\gui.pyc'>,
  False,
  <ubuntuone_installer.gui.qt.main.tests.test_windows.FakeLogger object at 0x086
9D9B0>),
 {})
b = (('Something not false',
  <module 'ubunt...

review: Needs Fixing

[lp:~mandel/ubuntuone-windows-installer/auto-update-python-only]

73. By Manuel de la Peña on 2011-09-19

Fixed the tests so that they take into account the new update method.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Roberto Alsina (ralsina)]

C:\Users\ROBERTO\canonical\fix_809873\scripts>"c:\Program Files (x86)\ubuntuone\dist\ubuntuone-installer-qt.exe"
Traceback (most recent call last):
  File "ubuntuone-installer-qt", line 51, in <module>
  File "ubuntuone_installer\gui\qt\main\windows.pyc", line 118, in main
  File "twisted\internet\defer.pyc", line 1141, in unwindGenerator
TypeError: check_credentials() takes at most 4 arguments (5 given)

review: Needs Fixing

[lp:~mandel/ubuntuone-windows-installer/auto-update-python-only]

74. By Manuel de la Peña on 2011-09-20

Pass the correct number of parameters.

[Roberto Alsina (ralsina)]

2011-09-20 09:51:56,575 - ubuntuone.installer.qt.gui - INFO - Updates are present.
Unhandled error in Deferred:
Traceback (most recent call last):
  File "twisted\internet\defer.pyc", line 388, in errback

  File "twisted\internet\defer.pyc", line 455, in _startRunCallbacks

  File "twisted\internet\defer.pyc", line 542, in _runCallbacks

  File "twisted\internet\defer.pyc", line 1076, in gotResult

--- <exception caught here> ---
  File "twisted\internet\defer.pyc", line 1018, in _inlineCallbacks

  File "twisted\python\failure.pyc", line 349, in throwExceptionIntoGenerator

  File "ubuntuone_installer\gui\qt\main\windows.pyc", line 85, in check_credentials

  File "twisted\internet\defer.pyc", line 1018, in _inlineCallbacks

  File "twisted\python\failure.pyc", line 349, in throwExceptionIntoGenerator

  File "ubuntuone_installer\gui\qt\main\windows.pyc", line 56, in success_cb

  File "twisted\internet\defer.pyc", line 1020, in _inlineCallbacks

  File "ubuntuone_installer\gui\qt\main\windows.pyc", line 97, in check_updates

  File "ubuntuone_installer\gui\qt\gui.pyc", line 96, in user_wants_to_update

exceptions.NameError: global name 'UPDATE_TITLE' is not defined

[lp:~mandel/ubuntuone-windows-installer/auto-update-python-only]

75. By Manuel de la Peña on 2011-09-20

Added missing var.

[Roberto Alsina (ralsina)]

Unhandled error in Deferred:
Traceback (most recent call last):
  File "twisted\internet\defer.pyc", line 388, in errback

  File "twisted\internet\defer.pyc", line 455, in _startRunCallbacks

  File "twisted\internet\defer.pyc", line 542, in _runCallbacks

  File "twisted\internet\defer.pyc", line 1076, in gotResult

--- <exception caught here> ---
  File "twisted\internet\defer.pyc", line 1018, in _inlineCallbacks

  File "twisted\python\failure.pyc", line 349, in throwExceptionIntoGenerator

  File "ubuntuone_installer\gui\qt\main\windows.pyc", line 85, in check_credentials

  File "twisted\internet\defer.pyc", line 1020, in _inlineCallbacks

  File "ubuntuone_installer\gui\qt\main\windows.pyc", line 58, in success_cb

  File "ubuntuone_installer\gui\qt\main\windows.pyc", line 38, in stop

  File "twisted\internet\base.pyc", line 570, in stop

twisted.internet.error.ReactorNotRunning: Can't stop reactor that isn't running.

[lp:~mandel/ubuntuone-windows-installer/auto-update-python-only]

76. By Manuel de la Peña on 2011-09-22

Merged with trunk.

77. By Manuel de la Peña on 2011-09-22

Removed the stop_fn since there is not need because the installer takes care of the situation in which the files are used.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-09-19 15:41:40 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-09-22 19:45:30 +0000
@@ -84,12 +84,23 @@
 CREDENTIALS_ERROR = _('Application will close.\n\n%r')
 SKIP_TOUR = _("Skip tour, go to Dashboard")
 START_SETUP = _("Start setup")
+UPDATE_TITLE = _("Updates are available")
+UPDATE_SOFTWARE = _("There is a new version available. Do you want perform an upgrade?")
 # Invalid name logger
 # pylint: disable=C0103
 logger = setup_logging('qt.gui')
 # pylint: enable=C0103
 
 
+def user_wants_to_update():
+    """Ask the user if he really wants to update the software."""
+    result = QtGui.QMessageBox.question(None, UPDATE_TITLE, UPDATE_SOFTWARE,
+            QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
+    if result == QtGui.QMessageBox.Yes:
+        return True
+    return False
+
+
 class LicensePage(SSOWizardPage):
     """Wizard Page that displays the license info and links to the GPL."""
 

=== modified file 'ubuntuone_installer/gui/qt/main/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/main/tests/test_windows.py	2011-09-19 23:00:32 +0000
+++ ubuntuone_installer/gui/qt/main/tests/test_windows.py	2011-09-22 19:45:30 +0000
@@ -59,22 +59,37 @@
     """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 CredsFailureMainTestCase(TestCase):
 
     """Test the qt main window."""
 
     stopped = False
+    updates_checked = False
 
     def stop(self):
         """A fake stop."""
         self.stopped = True
 
+    def check_updates(self, gui, logger):
+        """A fake check updates."""
+        self.updates_checked = True
+
     @defer.inlineCallbacks
     def test_failure(self):
         """Credential errors should display a critical message."""
@@ -116,6 +131,7 @@
         logger = FakeLogger()
         self.patch(utils, 'start_control_panel', self._set_called)
         self.patch(windows, 'stop', self.stop)
+        self.patch(windows, 'check_updates', self.check_updates)
         self.stopped = False
         yield windows.check_credentials(
             FakeCredentialsManagementTool,
@@ -126,6 +142,7 @@
         self.assertEqual(self._called, ((), {'with_icon': False}))
         # Should stop the app
         self.assertTrue(self.stopped)
+        self.assertTrue(self.updates_checked)
 
     @defer.inlineCallbacks
     def test_without_installed_flag(self):
@@ -136,7 +153,7 @@
             FakeCredentialsManagementTool,
             gui, logger)
         self.assertEqual(self._called, (('Something not false',
-            gui, False), {}))
+            gui, False, logger), {}))
 
     @defer.inlineCallbacks
     def test_with_installed_flag(self):
@@ -147,4 +164,4 @@
             FakeCredentialsManagementTool,
             gui, logger, installer=True)
         self.assertEqual(self._called, (('Something not false',
-            gui, True), {}))
+            gui, True, logger), {}))

=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-09-19 23:00:32 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-09-22 19:45:30 +0000
@@ -29,6 +29,7 @@
 # pylint: disable=W0611
 from ubuntuone_installer.gui.qt.ui import images_rc
 # pylint: enable=W0611
+from ubuntuone_installer.gui.qt import utils
 
 
 def stop(*args):
@@ -43,14 +44,20 @@
     'Error while getting the credentials: %r', exc)
     stop()
 
-
-def success_cb(creds, gui, installing):
[e-mail]
+def success_cb(creds, gui, installing, logger):
     """Handle credentials success."""
+    logger.debug('Got back from sso.')
     if creds:  # Have credentials already
-        from ubuntuone_installer.gui.qt import utils
+        logger.debug('Already got credentials.')
+        logger.info('Starting control panel.')
         utils.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()
@@ -65,7 +72,8 @@
 
 
 @defer.inlineCallbacks
-def check_credentials(credentials_tool, gui, logger, installer=False):
+def check_credentials(credentials_tool, gui, logger,
+                      installer=False):
     """Check credentials and either start u1cp or show the wizard."""
     credtool = credentials_tool()
     # pylint: disable=W0703
@@ -74,7 +82,23 @@
     except Exception, exc:
         error_cb(exc, logger)
     else:
-        success_cb(creds, gui, installer)
+        yield success_cb(creds, gui, installer, logger)
+
[e-mail]
+def check_updates(gui, logger):
+    """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_updates_present = yield utils.are_updates_present(logger) 
+    logger.debug('Updates present: %r', are_updates_present)
+    if are_updates_present:
+        logger.info('Updates are present.')
+        if gui.user_wants_to_update():
+            logger.info('Performing auto-update in diff process.')
+            utils.perform_update()
+    else:
+        logger.info('No updates are present.')
 
 
 def main(installing=False):

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-21 18:24:39 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-22 19:45:30 +0000
@@ -22,6 +22,7 @@
 from PyQt4 import QtGui, QtCore
 from ubuntuone.controlpanel.gui import qt
 from ubuntuone.platform.credentials import APP_NAME
+from twisted.internet import defer
 
 from ubuntuone_installer.gui import NEXT
 from ubuntuone_installer.gui.qt import gui, forgotten, utils
@@ -662,3 +663,51 @@
         [QtGui.QWizard.Stretch,
          QtGui.QWizard.FinishButton,
          QtGui.QWizard.NextButton])
+
+class UpgradeQuestion(BaseTestCase):
+    """Test the dialog that ask the user if he wants to upgrade."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set the tests."""
+        yield super(UpgradeQuestion, self).setUp()
+        self.answer = 0
+        self.parent = None 
+        self.title = None
+        self.text = None
+        self.yes_button = None
+        self.no_button = None
+
+        def fake_question(parent, title, text, yes_button,
+                no_button):
+            """Fake asking a question."""
+            self.parent = parent
+            self.title = title
+            self.text = text
+            self.yes_button = yes_button
+            self.no_button = no_button
+            return self.answer
+
+        self.patch(gui.QtGui.QMessageBox, 'question', fake_question)
+
+    def user_wants_to_update_true(self):
+        """Test the question."""
+        self.answer = gui.QtGui.QMessageBox.Yes
+        self.assertTrue(gui.user_wants_to_update(), 'User wants to update.')
+        # lets assert the parameters
+        self.assertTrue(None, self.parent)
+        self.assertTrue(self.title, gui.UPDATE_TITLE)
+        self.assertTrue(self.text, gui.UPDATE_SOFTWARE)
+        self.assertTrue(self.yes_button, gui.QtGui.QMessageBox.Yes)
+        self.assertTrue(self.no_button, gui.QtGui.QMessageBox.No)
+
+    def user_wants_to_update_false(self):
+        """Test the question."""
+        self.answer = gui.QtGui.QMessageBox.No
+        self.assertFalse(gui.user_wants_to_update(), 'User DOES NOT want to update.')
+        # lets assert the parameters
+        self.assertTrue(None, self.parent)
+        self.assertTrue(self.title, gui.UPDATE_TITLE)
+        self.assertTrue(self.text, gui.UPDATE_SOFTWARE)
+        self.assertTrue(self.yes_button, gui.QtGui.QMessageBox.Yes)
+        self.assertTrue(self.no_button, gui.QtGui.QMessageBox.No)

=== modified file 'ubuntuone_installer/gui/qt/utils/__init__.py'
--- ubuntuone_installer/gui/qt/utils/__init__.py	2011-09-01 13:52:35 +0000
+++ ubuntuone_installer/gui/qt/utils/__init__.py	2011-09-22 19:45:30 +0000
@@ -28,9 +28,13 @@
     start_control_panel = windows.start_control_panel
     add_syncdaemon_to_autostart = windows.add_syncdaemon_to_autostart
     default_folders = windows.default_folders
+    are_updates_present = windows.are_updates_present
+    perform_update = windows.perform_update
 else:
     from ubuntuone_installer.gui.qt.utils import linux
     uninstall_application = linux.uninstall_application
     start_control_panel = linux.start_control_panel
     add_syncdaemon_to_autostart = linux.add_syncdaemon_to_autostart
     default_folders = linux.default_folders
+    are_updates_present = lambda *args, **kwargs: False 
+    perform_update = lambda *args, **kwargs: None 

=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-19 23:01:24 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-22 19:45:30 +0000
@@ -27,6 +27,8 @@
 import win32api
 # pylint: enable=F0401
 
+from twisted.internet import defer
+
 from ubuntuone_installer.gui.qt import utils
 from ubuntuone_installer.gui.qt.tests import BaseTestCase
 
@@ -229,3 +231,86 @@
         pictures = buf.value
         expected = [docs, music, pictures]
         self.assertEqual(sorted(folders), sorted(expected))
+
+
+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."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Prepare for the diff tests."""
+        yield super(AutoupdaterTestCase, self).setUp()
+        self.auto_update_path = r'path\to\exe'
+        self.return_from_call = 0
+        self.command = None
+        self.args = []
+
+        def fake_execute_process(command, args=None, path=None):
+            """Fake async process execution."""
+            self.command = command
+            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)
+
+
+    @defer.inlineCallbacks
+    def test_are_updates_present_true(self):
+        """Test when updates are present."""
+        # the idea is simple, set the value to be returned from
+        # 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)
+        self.assertTrue(are_present, 'Updates should be present.')
+        # lets assert that we did use the correct args
+        expected_args = ('--mode', 'unattended')
+        self.assertEqual(expected_args, self.args)
+        self.assertEqual(self.command, self.auto_update_path)
+
+
+    @defer.inlineCallbacks
+    def test_are_updates_present_false(self):
+        """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) 
+        self.assertFalse(are_present, 'Updates should NOT be present.')
+        # lets assert that we did use the correct args
+        expected_args = ('--mode', 'unattended')
+        self.assertEqual(expected_args, self.args)
+        self.assertEqual(self.command, self.auto_update_path)
+
+    def test_perform_update(self):
+        """Test the method that perfroms the update."""
+        self.patch(utils.windows.win32api, 'ShellExecute', self._set_called)
+        utils.perform_update()
+        self.assertIn(self.auto_update_path, self._called[0][2])
+        self.assertEqual('runas', self._called[0][1])
+        self.assertEqual('--unattendedmodeui none', self._called[0][3])
+        self.assertEqual('', self._called[0][4])
+        self.assertEqual(0, self._called[0][5])
+
+    def test_get_auto_update_path(self):
+        """Test the method used to get the autoupdate."""
+
+

=== modified file 'ubuntuone_installer/gui/qt/utils/windows.py'
--- ubuntuone_installer/gui/qt/utils/windows.py	2011-09-19 23:00:32 +0000
+++ ubuntuone_installer/gui/qt/utils/windows.py	2011-09-22 19:45:30 +0000
@@ -30,6 +30,9 @@
 import _winreg
 # pylint: enable=F0401
 
+from twisted.internet import defer
+from twisted.internet.utils import getProcessValue 
+
 AUTORUN_KEY = r"Software\Microsoft\Windows\CurrentVersion\Run"
 
 
@@ -47,6 +50,47 @@
             '--mode win32', '', 0)
 
 
+def _get_update_path():
+    """Return the path in which the autoupdate command is found."""
+    if hasattr(sys, "frozen"):
+        exec_path = os.path.abspath(sys.executable)
+    else:
+        exec_path = os.path.dirname(__file__)
+    folder = os.path.dirname(exec_path)
+    update_path = os.path.join(folder, "autoupdate-windows.exe")
+    if os.path.exists(update_path):
+        return update_path
+    return None
+
+
[e-mail]
+def are_updates_present(logger):
+    """Return if there are updates for Ubuntu One."""
+    update_path = _get_update_path()
+    logger.debug('Update path %s', update_path)
+    if update_path is not None:
+        # If there is an update present we will get 0 and other number
+        # otherwise
+        retcode = yield getProcessValue(update_path, args=('--mode',
+            'unattended'), path=os.path.dirname(update_path))
+        logger.debug('Return code %s', retcode)
+        if retcode == 0:
+            logger.debug('Returning True')
+            defer.returnValue(True)
+    logger.debug('Returning False')
+    defer.returnValue(False)
+
+
+def perform_update():
+    """Spawn the autoupdate process and call the stop funtion."""
+    update_path = _get_update_path()
+    if update_path is not None:
+        # lets call the updater with the commands that are required,
+        win32api.ShellExecute(None, 'runas',
+            update_path,
+            '--unattendedmodeui none', '', 0)
+
+
 def start_control_panel(with_icon=True):
     """Start the control panel."""
     # If we are in windows and "frozen", assume it's in