Merge lp:~nataliabidart/ubuntuone-windows-installer/stable-3-0-update into lp:ubuntuone-windows-installer/stable-3-0

[Natalia Bidart]

[ Diego Sarmentero <email address hidden> ]
  - Fixed lint issues.
  - Fixed: When logging in with an no-yet-validated account, there is no useful
    message (LP: #851885).
  - Fixed congratulations page (LP: #859711).

[ Manuel de la Pena <email address hidden> ]
  - Put all the different pieces of the migration together so that we perform
    the uninstall and migtration of the data if the user has the very
    old first beta.
  - Fixes the code that will call the autoupdate-windows.exe. The idea is that
    in the release the .exe will be in a diff location to avoid dll collisions.
  - Changed the import from ubuntuone-dev-tools so that we do not use the
    deprecated API.

[ Natalia B. Bidart <email address hidden> ]
  - Pass module for test to u1trial properly.

All green in ubuntu, and windows (tested windows 7).

IRL tested on windows.

[Roberto Alsina (ralsina)]

Looks good!

review: Approve

=== modified file 'data/qt/congratulations.ui'
--- data/qt/congratulations.ui	2011-09-08 14:49:31 +0000
+++ data/qt/congratulations.ui	2011-12-19 21:30:29 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>622</width>
-    <height>331</height>
+    <height>362</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,20 +21,6 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QLabel" name="label">
-     <property name="font">
-      <font>
-       <pointsize>14</pointsize>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Congratulations!</string>
-     </property>
-    </widget>
-   </item>
-   <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <spacer name="horizontalSpacer">
@@ -50,7 +36,7 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="label_2">
+      <widget class="QLabel" name="image_label">
        <property name="text">
         <string/>
        </property>
@@ -83,6 +69,9 @@
    </item>
    <item>
     <widget class="QWidget" name="progressContainer" native="true">
+     <property name="layoutDirection">
+      <enum>Qt::RightToLeft</enum>
+     </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="spacing">
        <number>0</number>

=== modified file 'run-tests.bat'
--- run-tests.bat	2011-08-24 17:04:02 +0000
+++ run-tests.bat	2011-12-19 21:30:29 +0000
@@ -66,4 +66,4 @@
 "%PYTHONEXEPATH%\python.exe" setup.py build
 ECHO Running tests
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" -i "test_linux.py" ubuntuone_installer --gui --reactor=qt4
+"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" -i "test_linux.py" --gui --reactor=qt4 -c ubuntuone_installer

=== modified file 'setup.py'
--- setup.py	2011-12-01 19:30:38 +0000
+++ setup.py	2011-12-19 21:30:29 +0000
@@ -228,7 +228,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntuone-installer',
-    version='2.99',
+    version='2.99.0',
     license='GPL v3',
     author='Roberto Alsina',
     author_email='[e-mail]',

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-11-11 20:36:16 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-12-19 21:30:29 +0000
@@ -1,8 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[e-mail]>
-#          Roberto Alsina <[e-mail]>
-#          Diego Sarmentero <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -84,31 +80,71 @@
 from ubuntuone_installer.gui.qt.side_widget import SideWidget
 
 _ = gettext.gettext
+CONGRATULATIONS = _("Congratulations")
+CREDENTIALS_ERROR_TITLE = _("Error getting credentials")
+CREDENTIALS_ERROR = _('Application will close.\n\n%r')
 SIGN_IN = _("Sign in to Ubuntu One")
 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')
 SKIP_TOUR = _("Skip tour, go to Dashboard")
 START_SETUP = _("Start setup")
 SUCCESSFUL_LOGIN = _("Login successful")
+TITLE_STYLE = "<span style=\"font-size:24px\">%s</span>"
 UPDATE_TITLE = _("Updates are available")
 UPDATE_SOFTWARE = _("There is a new version available. "
                     "Do you want perform an upgrade?")
+REMOVE_OLD_BETA_TITLE = _("Remove old Beta")
+REMOVE_OLD_BETA = _("The old Ubuntu One Beta is installed in your system. Do "
+                    "you want to uninstall it?")
+REMOVE_OLD_BETA_ERROR = _("There was an error uninstall the old beta. Please "
+                          "do this step manually")
+MIGRATE_OLD_BETA_DATA_TITLE = _("Migrate old data")
+MIGRATE_OLD_BETA = _("Do you want to migrate the files from the old Ubuntu "
+                     "One Beta location to the new one?")
+MIGRATE_OLD_BETA_DATA_ERROR = _("There was an error migrating your data. "
+                                "Please do this step manually.")
+
 # Invalid name logger
 # pylint: disable=C0103
 logger = setup_logging('qt.gui')
 # pylint: enable=C0103
 
 
+def _ask_user_question(title, question):
+    """Ask the user a Yes/No question."""
+    result = QtGui.QMessageBox.question(None, title, question,
+            QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
+    return result == QtGui.QMessageBox.Yes
+
+
 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
+    return _ask_user_question(UPDATE_TITLE, UPDATE_SOFTWARE)
+
+
+def user_wants_to_remove_old_beta():
+    """Ask the user if he really wants to remove the old beta."""
+    return _ask_user_question(REMOVE_OLD_BETA_TITLE, REMOVE_OLD_BETA)
+
+
+def user_wants_to_migrate_data():
+    """Ask the user if he really wants to migrate the data."""
+    return _ask_user_question(MIGRATE_OLD_BETA_DATA_TITLE, MIGRATE_OLD_BETA)
+
+
+def _warn_user(title, message):
+    """Warn the user."""
+    QtGui.QMessageBox.warning(None, title, message, QtGui.QMessageBox.Ok)
+
+
+def warn_user_beta_not_removed():
+    """Let the user know that the data was not migrated."""
+    _warn_user(REMOVE_OLD_BETA_TITLE, REMOVE_OLD_BETA_ERROR)
+
+
+def warn_user_data_not_migrated():
+    """Let the user know that the data was not migrated."""
+    _warn_user(MIGRATE_OLD_BETA_DATA_TITLE, MIGRATE_OLD_BETA_DATA_ERROR)
 
 
 class LicensePage(SSOWizardPage):
@@ -213,6 +249,10 @@
         self.ui.sign_in_button.style().polish(
             self.ui.sign_in_button)
 
+    def cleanupPage(self):
+        """Reset the state of the wizard if Verification code was visited."""
+        self.wizard()._next_id = None
+
 
 class SuccessPage(SSOWizardPage):
     """Shown after SSO login, before setup."""
@@ -266,6 +306,7 @@
         super(CongratulationsPage, self).__init__(
             congratulations_ui.Ui_Form(), None, parent)
         self.setFinalPage(True)
+        self.setTitle(CONGRATULATIONS)
 
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
@@ -305,6 +346,7 @@
     # definition of the signals raised by the widget (for SSO)
     recoverableError = QtCore.pyqtSignal('QString', 'QString')
     loginSuccess = QtCore.pyqtSignal('QString', 'QString')
+    registrationIncomplete = QtCore.pyqtSignal('QString', 'QString')
     registrationSuccess = QtCore.pyqtSignal('QString', 'QString')
     userCancellation = QtCore.pyqtSignal('QString')
 
@@ -412,6 +454,7 @@
         self.reset_password_page_id = self.addPage(self.reset_password)
 
         self.loginSuccess.connect(self.login_success_slot)
+        self.registrationIncomplete.connect(self.registration_incomplete)
         self.registrationSuccess.connect(self.registration_success_slot)
 
         # End of SSO pages
@@ -470,6 +513,12 @@
         self.next()
         self._next_id = self.SYNC_NOW_OR_LATER_PAGE
 
+    def registration_incomplete(self):
+        """Called when registration wasn't completed."""
+        self._next_id = self.email_verification_page_id
+        self.next()
+        self._next_id = self.SUCCESS_PAGE
+
     def registration_success_slot(self):
         """Called on successful registration."""
         self._next_id = self.SUCCESS_PAGE

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-11-11 20:36:16 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-12-19 21:30:29 +0000
@@ -347,6 +347,36 @@
         folders_page.on_check_settings_button_clicked()
         self.assertEqual(self.ui.currentId(), self.ui.preferences_page_id)
 
+    def test_current_user_sign_in_page_clenaup(self):
+        """Check CurrentUserSignIn cleanupPage method."""
+        current_signin_page = self.ui.page(self.ui.current_user_page_id)
+
+        # Show the current id page
+        self.ui.setStartId(self.ui.current_user_page_id)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+
+        self.ui._next_id = self.ui.SUCCESS_PAGE
+        current_signin_page.cleanupPage()
+        # pylint: disable=W0212
+        self.assertEqual(self.ui._next_id, None)
+        # pylint: enable=W0212
+
+    def test_registration_incomplete(self):
+        """Check the registration_incomplete slot."""
+        self.ui.setStartId(self.ui.current_user_page_id)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+
+        self.ui.registration_incomplete()
+        self.assertEqual(self.ui.currentId(),
+            self.ui.email_verification_page_id)
+        # pylint: disable=W0212
+        self.assertEqual(self.ui._next_id, self.ui.SUCCESS_PAGE)
+        # pylint: enable=W0212
+
     def test_critical(self):
         """Show a critical popup, but first hide the overlay."""
         self.assertEqual(self.ui.overlay.hide_counter, 1)
@@ -495,6 +525,19 @@
         self.assertEqual(self._called, False)
         self.assertEqual(FakeAreYouSure.shown, False)
 
+    def test_congratulations_page_title(self):
+        """Check congratulations page title."""
+        congratulations_page = self.ui.page(self.ui.CONGRATULATIONS_PAGE)
+        self.ui.setStartId(self.ui.CONGRATULATIONS_PAGE)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        congratulations_page.initializePage()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.assertEqual(congratulations_page.header.title_label.text(),
+            gui.CONGRATULATIONS)
+
     def test_current_user_controller_parameters(self):
         """Compare controller parameters with expected values."""
         self.assertEqual(self.ui.current_user_controller.args,
@@ -615,6 +658,7 @@
 
     currentIdChanged = FakeSignal()
     loginSuccess = FakeSignal()
+    registrationIncomplete = FakeSignal()
     registrationSuccess = FakeSignal()
     userCancellation = FakeSignal()
     shown = False
@@ -716,51 +760,122 @@
         self.assertTrue(self.ui.ui.existing_account_button.isDefault())
 
 
-class UpgradeQuestion(BaseTestCase):
+class MessageBoxTestCase(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()
+        yield super(MessageBoxTestCase, 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.ok_button = None
+
+        class FakeMessageBox(object):
+            """A fake message box."""
+
+            No = 'No'
+            Yes = 'Yes'
+            Ok = 'Ok'
+
+            @classmethod
+            def question(cls, 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
+
+            @classmethod
+            def warning(cls, parent, title, text, ok_button):
+                """Fake warning the user."""
+                self.parent = parent
+                self.title = title
+                self.text = text
+                self.ok_button = ok_button
+                return self.answer
+
+        self.patch(gui.QtGui, 'QMessageBox', FakeMessageBox)
+
+    def _assert_question(self, question_title, question_text):
+        """Assert the execution of a question."""
+        self.assertEqual(None, self.parent)
+        self.assertEqual(self.title, question_title)
+        self.assertEqual(self.text, question_text)
+        self.assertEqual(self.yes_button, gui.QtGui.QMessageBox.Yes)
+        self.assertEqual(self.no_button, gui.QtGui.QMessageBox.No)
+
+    def _assert_true_question(self, question_fn, question_title,
+                              question_text):
+        """Assert a positive answer to a 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)
+        self.assertTrue(question_fn())
+        self._assert_question(question_title, question_text)
 
-    def user_wants_to_update_false(self):
-        """Test the question."""
+    def _assert_false_question(self, question_fn, question_title,
+                               question_text):
+        """Assert a negative answer to a question."""
         self.answer = gui.QtGui.QMessageBox.No
-        msg = 'user_wants_to_update must return False when the answer is No.'
-        self.assertFalse(gui.user_wants_to_update(), msg)
-        # 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)
+        self.assertFalse(question_fn())
+        self._assert_question(question_title, question_text)
+
+    def test_user_wants_to_update_true(self):
+        """Test the question."""
+        self._assert_true_question(gui.user_wants_to_update, gui.UPDATE_TITLE,
+                                   gui.UPDATE_SOFTWARE)
+
+    def test_user_wants_to_update_false(self):
+        """Test the question."""
+        self._assert_false_question(gui.user_wants_to_update, gui.UPDATE_TITLE,
+                                    gui.UPDATE_SOFTWARE)
+
+    def test_user_wants_to_remove_true(self):
+        """Test the question."""
+        self._assert_true_question(gui.user_wants_to_remove_old_beta,
+                                   gui.REMOVE_OLD_BETA_TITLE,
+                                   gui.REMOVE_OLD_BETA)
+
+    def test_user_wants_to_remove_false(self):
+        """Test the question."""
+        self._assert_false_question(gui.user_wants_to_remove_old_beta,
+                                    gui.REMOVE_OLD_BETA_TITLE,
+                                    gui.REMOVE_OLD_BETA)
+
+    def test_user_wants_to_migrate_true(self):
+        """Test the question."""
+        self._assert_true_question(gui.user_wants_to_migrate_data,
+                                   gui.MIGRATE_OLD_BETA_DATA_TITLE,
+                                   gui.MIGRATE_OLD_BETA)
+
+    def test_user_wants_to_migrate_false(self):
+        """Test the question."""
+        self._assert_false_question(gui.user_wants_to_migrate_data,
+                                    gui.MIGRATE_OLD_BETA_DATA_TITLE,
+                                    gui.MIGRATE_OLD_BETA)
+
+    def _assert_warn_user(self, warn_fn, title, text):
+        """Assert waning a user."""
+        self.assertEqual(None, warn_fn())
+        self.assertEqual(None, self.parent)
+        self.assertEqual(self.title, title)
+        self.assertEqual(self.text, text)
+        self.assertEqual(self.ok_button, gui.QtGui.QMessageBox.Ok)
+
+    def test_warn_user_data_migration(self):
+        """Test warning the user."""
+        self._assert_warn_user(gui.warn_user_data_not_migrated,
+                               gui.MIGRATE_OLD_BETA_DATA_TITLE,
+                               gui.MIGRATE_OLD_BETA_DATA_ERROR)
+
+    def test_warn_user_old_app_removal(self):
+        """Test warning the user."""
+        self._assert_warn_user(gui.warn_user_beta_not_removed,
+                               gui.REMOVE_OLD_BETA_TITLE,
+                               gui.REMOVE_OLD_BETA_ERROR)

=== modified file 'ubuntuone_installer/gui/qt/utils/__init__.py'
--- ubuntuone_installer/gui/qt/utils/__init__.py	2011-11-11 19:27:39 +0000
+++ ubuntuone_installer/gui/qt/utils/__init__.py	2011-12-19 21:30:29 +0000
@@ -42,6 +42,7 @@
     uninstall_old_beta = windows.uninstall_old_beta
     migrate_old_data = windows.migrate_old_data
     check_updates = windows.check_updates
+    perform_old_beta_data_migration = windows.perform_old_beta_data_migration
 else:
     from ubuntuone_installer.gui.qt.utils import linux
     uninstall_application = linux.uninstall_application
@@ -54,6 +55,7 @@
     uninstall_old_beta = lambda *args, **kwargs: None
     migrate_old_data = lambda *args, **kwargs: None
     check_updates = lambda *args, **kwargs: None
+    perform_old_beta_data_migration = lambda *args, **kwargs: None
 # pylint: enable=C0103
 
 
@@ -76,6 +78,10 @@
             logger.info('Updates checked, stopping.')
             stop_cb()
         else:  # No credentials
+            # if there are no credentials it usually means that we
+            # are installing the application, before we do anything
+            # lets check if the old beta is present
+            yield perform_old_beta_data_migration(gui)
             logger.info('Got empty credentials, starting wizard app.')
             window = gui.MainWindow(close_callback=stop_cb,
                                     installing=installing)

=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_common.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_common.py	2011-11-11 19:28:10 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_common.py	2011-12-19 21:30:29 +0000
@@ -69,11 +69,19 @@
 
         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.migrate_data_cb = lambda gui: \
+                        self.called.extend(('migrate_data_cb', gui))
+
+        self.patch(utils, 'perform_old_beta_data_migration',
+           self.migrate_data_cb)
+
         self.patch(gui, 'MainWindow', FakeWindow)
 
     @defer.inlineCallbacks
@@ -110,3 +118,4 @@
         self.assertTrue(FakeWindow.visible)
         msgs = ('Got empty credentials', 'starting wizard')
         self.assertTrue(self.memento.check_info(*msgs))
+        self.assertEqual(self.called, ['migrate_data_cb', gui])

=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-11-11 19:27:39 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-12-19 21:30:29 +0000
@@ -37,6 +37,9 @@
 from ubuntuone_installer.gui.qt import utils
 from ubuntuone_installer.gui.qt.tests import BaseTestCase
 
+# we want to test private methods
+# pylint:disable=W0212
+
 
 class UninstallerTestCase(BaseTestCase):
 
@@ -395,7 +398,7 @@
         self.patch(utils.windows, 'deferToThread',
                    fake_msi_install_product)
         self.assertFailure(utils.uninstall_old_beta(),
-                           utils.windows.MsiException)
+                           utils.windows.UninstallException)
         self.assertEqual(self.called['property_uid'],
                          utils.windows.OLD_BETA_UID_KEY)
         self.assertEqual(self.called['property_name'], u'LocalPackage')
@@ -416,7 +419,7 @@
         self.patch(utils.windows, 'get_property_for_product',
                    fake_get_property_for_product)
         self.assertFailure(utils.uninstall_old_beta(),
-                           utils.windows.MsiException)
+                           utils.windows.UninstallException)
         self.assertEqual(self.called['uid'], utils.windows.OLD_BETA_UID_KEY)
         self.assertEqual(self.called['property_name'], u'LocalPackage')
 
@@ -527,8 +530,49 @@
         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."""
+
+class UpdatePathTestCase(BaseTestCase):
+    """Test getting the update path."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set the different tests."""
+        yield super(UpdatePathTestCase, self).setUp()
+        self.module_path = os.path.join('.', 'root', 'exe', 'dist')
+        self.module_path = os.path.abspath(self.module_path)
+        self.patch(os.path, 'exists', lambda *args: True)
+
+    def _clean_file(self, module, path):
+        """Set back the correct path."""
+        module.__file__ = path
+
+    def _clean_frozen(self, old_executable):
+        """Set back not to be frozen."""
+        del sys.frozen
+        sys.executable = old_executable
+
+    def test_get_update_path_not_frozen(self):
+        """Test we return the path to levels up to the dist."""
+        old_utils_path = utils.windows.__file__
+        utils.windows.__file__ = os.path.join(self.module_path, 'windows.py')
+        self.addCleanup(self._clean_file, utils.windows, old_utils_path)
+        expected_path = os.path.join('root',
+                utils.windows.AUTO_UPDATE_EXE)
+        expected_path = os.path.abspath(expected_path)
+        path = utils.windows._get_update_path()
+        self.assertEqual(expected_path, path)
+
+    def test_get_update_path_frozen(self):
+        """Test we return the path to levels up to the dist."""
+        sys.frozen = True
+        old_exe = sys.executable
+        sys.executable = os.path.join(self.module_path, 'ubuntuone.exe')
+        self.addCleanup(self._clean_frozen, old_exe)
+        expected_path = os.path.join('root', 'exe',
+                utils.windows.AUTO_UPDATE_EXE)
+        expected_path = os.path.abspath(expected_path)
+        path = utils.windows._get_update_path()
+        self.assertEqual(expected_path, path)
 
 
 class CheckUpdatesTestCase(BaseTestCase):

=== modified file 'ubuntuone_installer/gui/qt/utils/windows.py'
--- ubuntuone_installer/gui/qt/utils/windows.py	2011-11-11 19:27:39 +0000
+++ ubuntuone_installer/gui/qt/utils/windows.py	2011-12-19 21:30:29 +0000
@@ -67,9 +67,10 @@
 # LONG_PATH_PREFIX will always be appended only to windows paths,
 # which should always be unicode.
 LONG_PATH_PREFIX = u'\\\\?\\'
-
-
-class MsiException(Exception):
+AUTO_UPDATE_EXE = 'autoupdate-windows.exe'
+
+
+class UninstallException(Exception):
     """Raised when there are msi issues."""
 
 
@@ -97,8 +98,12 @@
         exec_path = os.path.abspath(sys.executable)
     else:
         exec_path = os.path.dirname(__file__)
+    # we take as an axiom that the python code is present in a dist
+    # folder (whatever the path is) and that the autoupdate is
+    # present in a level above it
+    exec_path = os.path.dirname(exec_path)
     folder = os.path.dirname(exec_path)
-    update_path = os.path.join(folder, "autoupdate-windows.exe")
+    update_path = os.path.join(folder, AUTO_UPDATE_EXE)
     if os.path.exists(update_path):
         return update_path
     return None
@@ -257,10 +262,10 @@
         result = yield deferToThread(ctypes.windll.msi.MsiInstallProductW,
                                      uninstall_path, command_line)
         if result != ERROR_SUCCESS:
-            raise MsiException('Could not remove old beta.')
+            raise UninstallException('Could not remove old beta.')
     else:
         # the local file is missing so we cannot un install it :(
-        raise MsiException('Could not remove old beta.')
+        raise UninstallException('Could not remove old beta.')
 
 
 def _append_long_path(path):
@@ -302,3 +307,26 @@
             new_full_path = os.path.join(new_location, path)
             yield deferToThread(shutil.move, old_full_path,
                                 new_full_path)
+
+
[e-mail]
+def perform_old_beta_data_migration(gui):
+    """Perform the migration from the old beta."""
+    if is_old_beta_installed() and \
+            gui.user_wants_to_remove_old_beta():
+        logger.debug('Old beta is installed and user wants to remove it.')
+        try:
+            # uninstall the msi and migrate data
+            yield uninstall_old_beta()
+            # ask the user if he wants to move his data
+            if gui.user_wants_to_migrate_data():
+                yield migrate_old_data()
+        except UninstallException:
+            logger.error('Could not uninstall msi: %s')
+            gui.warn_user_beta_not_removed()
+        except DataMigrationException:
+            # we did uninstall the msi \o/ but failed in the data migration.
+            # This is not a big deal, lets just tell the user that he has to
+            # manually do it
+            logger.error('Could not migrate data: %s')
+            gui.warn_user_data_not_migrated()

=== modified file 'ubuntuone_installer/tests/__init__.py'
--- ubuntuone_installer/tests/__init__.py	2011-10-28 11:00:42 +0000
+++ ubuntuone_installer/tests/__init__.py	2011-12-19 21:30:29 +0000
@@ -21,7 +21,7 @@
 
 from twisted.internet import defer
 
-from ubuntuone.devtools.testcase import TestCase as BaseTestCase
+from ubuntuone.devtools.testcases import TestCase as BaseTestCase
 
 
 class TestCase(BaseTestCase):