Merge lp:~mandel/ubuntuone-windows-installer/fix-vista-update into lp:ubuntuone-windows-installer

[Manuel de la Peña]

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.

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.

[Roberto Alsina (ralsina)]

+1 code review

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1 looks fine

review: Approve

=== 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-11-16 15:56:23 +0000
@@ -527,8 +527,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-11-16 15:56:23 +0000
@@ -67,7 +67,7 @@
 # LONG_PATH_PREFIX will always be appended only to windows paths,
 # which should always be unicode.
 LONG_PATH_PREFIX = u'\\\\?\\'
-
+AUTO_UPDATE_EXE = 'autoupdate-windows.exe'
 
 class MsiException(Exception):
     """Raised when there are msi issues."""
@@ -97,8 +97,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