Merge lp:~ralsina/ubuntuone-windows-installer/start_right into lp:ubuntuone-windows-installer

[Roberto Alsina]

use --with-icon when starting u1cp from the installer

use --with-icon when starting u1cp from the installer

[Natalia Bidart (nataliabidart)]

I've got this test failure:

[FAIL]
Traceback (most recent call last):
  File "/home/nessita/canonical/windows-installer/review_start_right/ubuntuone_installer/gui/qt/tests/test_gui.py", line 458, in test_start_control_panel_on_finishing
    ((['ubuntuone-control-panel-qt', '--with-icon'],), {}))
twisted.trial.unittest.FailTest: not equal:
a = ((['ubuntuone-control-panel-qt'],), {})
b = ((['ubuntuone-control-panel-qt', '--with-icon'],), {})

ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_start_control_panel_on_finishing

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/start_right]

66. By Roberto Alsina on 2011-09-15

separate linux/windows test

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-15 18:00:28 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-15 18:49:23 +0000
@@ -449,7 +449,17 @@
         """Check if the main properties of the windows are set."""
         self.assertEqual(self.ui.windowTitle(), APP_NAME)
 
-    def test_start_control_panel_on_finishing(self):
+    @skipIfOS('linux2', 'Windows-specific tests.')
+    def test_start_control_panel_on_finishing_windows(self):
+        """Calling done with result=1, the control panel should be called."""
+        gui.AreYouSure.result = 1
+        self.patch(subprocess, "Popen", self._set_called)
+        self.ui.done(result=1)
+        self.assertEqual(self._called,
+            ((['ubuntuone-control-panel-qt', '--with-icon'],), {}))
+
+    @skipIfOS('win32', 'Linux-specific tests.')
+    def test_start_control_panel_on_finishing_linux(self):
         """Calling done with result=1, the control panel should be called."""
         gui.AreYouSure.result = 1
         self.patch(subprocess, "Popen", self._set_called)
 
=== modified file 'ubuntuone_installer/gui/qt/utils/windows.py'
--- ubuntuone_installer/gui/qt/utils/windows.py	2011-09-13 01:33:57 +0000
+++ ubuntuone_installer/gui/qt/utils/windows.py	2011-09-15 18:49:23 +0000
@@ -57,7 +57,7 @@
             "ubuntuone-control-panel-qt.exe")
     else:
         cp_path = "ubuntuone-control-panel-qt"
-    subprocess.Popen([cp_path, ])
+    subprocess.Popen([cp_path, "--with-icon"])
 
 
 def add_syncdaemon_to_autostart():