Merge lp:~ralsina/ubuntuone-windows-installer/start-dashboard into lp:ubuntuone-windows-installer

[Roberto Alsina]

If on windows and frozen, assume the control panel is on the same folder as the wizard.

If on windows and frozen, assume the control panel is on the same folder as the wizard.

To test IRL (not trivial, I know ;-):

* Build a bundle with this branch and trunk from controlpanel and sso.
  You can do this using lp:~ralsina/ubuntuone-windows-installer/fix_809873
  instructions in scripts/README
* Run the wizard
* Click on "start dashboard"
* It should start

Or you can just read the code and/or trust the tests ;-)

[lp:~ralsina/ubuntuone-windows-installer/start-dashboard]

21. By Roberto Alsina on 2011-08-02

merge trunk

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-07-28 18:24:58 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-08-02 14:14:50 +0000
@@ -19,7 +19,9 @@
 
 """The user interface for the Ubuntu One Installer."""
 
+import os
 import subprocess
+import sys
 
 import gettext
 
@@ -459,7 +461,15 @@
         """The main window is being closed, call any custom callback."""
         # Finished, not cancelled
         if result == 1:  # Cancelled
-            subprocess.Popen(["ubuntuone-control-panel-qt", ])
+            # If we are in windows and "frozen", assume it's in
+            # the same folder as this .exe
+            if sys.platform == "win32" and hasattr(sys, "frozen"):
+                cp_path = os.path.join(os.path.dirname(
+                    os.path.abspath(sys.executable)),
+                    "ubuntuone-control-panel-qt.exe")
+            else:
+                cp_path = "ubuntuone-control-panel-qt"
+            subprocess.Popen([cp_path, ])
         elif self.currentId() != self.CONGRATULATIONS_PAGE:
             if AreYouSure(self).exec_():
                 return

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-07-27 15:09:28 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-02 14:14:50 +0000
@@ -200,10 +200,25 @@
         """Calling done with result=1, the control panel should be called."""
         gui.AreYouSure.result = 0
         self.patch(gui.subprocess, "Popen", self._set_called)
+        # If it's frozen this test fails because the path
+        # depends on the location of the exe
+        if hasattr(gui.sys, "frozen"):
+            delattr(gui.sys, "frozen")
         self.ui.done(result=1)
         self.assertEqual(self._called,
             ((['ubuntuone-control-panel-qt'],), {}))
 
+    def test_start_control_panel_frozen(self):
+        """When frozen, the control-panel has a path."""
+        gui.AreYouSure.result = 0
+        help(self.patch)
+        # I can't patch sys because frozen is not there by default
+        gui.sys.frozen = True
+        self.patch(gui.subprocess, "Popen", self._set_called)
+        self.ui.done(result=1)
+        self.assertTrue(os.sep in self._called[0][0][0])
+        self.assertTrue('ubuntuone-control-panel-qt' in self._called[0][0][0])
+
     def test_not_start_control_panel_on_cancel(self):
         """Called done with result=0, control panel should NOT be called."""
         gui.AreYouSure.result = 0