Merge lp:~nataliabidart/ubuntuone-windows-installer/start-right into lp:ubuntuone-windows-installer

[Natalia Bidart]

- Start the control panel using the --with-icon switch (LP: #851221).

[lp:~nataliabidart/ubuntuone-windows-installer/start-right]

69. By Natalia Bidart on 2011-09-15

Removing commented out lines.

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-15 19:10:23 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-15 19:59:23 +0000
@@ -19,14 +19,9 @@
 
 """Tests for the Qt UI."""
 
-import os
-import subprocess
-import sys
-
 from PyQt4 import QtGui, QtCore
-from ubuntuone.devtools.testcase import skipIfOS
+from ubuntuone.controlpanel.gui import qt
 from ubuntuone.platform.credentials import APP_NAME
-from ubuntuone.controlpanel.gui import qt
 
 from ubuntuone_installer.gui import NEXT
 from ubuntuone_installer.gui.qt import gui, forgotten, utils
@@ -485,38 +480,15 @@
         """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):
-        """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'],), {}))
-
-    @skipIfOS('linux2', 'Windows-specific tests.')
-    def test_start_control_panel_frozen(self):
-        """When frozen, the control-panel has a path."""
-        self.ui.restart()
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-        gui.AreYouSure.result = 1
-        # I can't patch sys because frozen is not there by default
-        sys.frozen = True
-
-        def clean_frozen():
-            """Remove sys.frozen."""
-            del sys.frozen
-
-        self.addCleanup(clean_frozen)
-        self.patch(subprocess, "Popen", self._set_called)
-        self.ui.done(result=1)
-        self.assertIn(os.sep, self._called[0][0][0])
-        self.assertIn('ubuntuone-control-panel-qt', self._called[0][0][0])
+    def test_start_control_panel(self):
+        """The control panel starter is called."""
+        self.patch(utils, 'start_control_panel', self._set_called)
+        self.ui.done(result=1)
+        self.assertEqual(self._called, ((), {}))
 
     def test_not_start_control_panel_on_cancel(self):
         """Called done with result=0, control panel should NOT be called."""
-        gui.AreYouSure.result = 1
-        self.patch(subprocess, "Popen", self._set_called)
+        self.patch(utils, 'start_control_panel', self._set_called)
         self.ui.done(result=0)
         self.assertEqual(self._called, False)
 
@@ -526,7 +498,6 @@
         self.patch(self.ui, 'currentId', lambda: self.ui.SIGNIN_PAGE)
         # Make AreYouSure say the user is "not sure"
         gui.AreYouSure.result = 0
-        self.patch(subprocess, "Popen", self._set_called)
         self.ui.show()
         self.addCleanup(self.ui.hide)
         self.ui.done(result=0)
@@ -537,7 +508,6 @@
         self.ui.show()
         self.addCleanup(self.ui.hide)
         self.patch(self.ui, 'currentId', lambda: self.ui.CONGRATULATIONS_PAGE)
-        self.patch(subprocess, "Popen", self._set_called)
         self.ui.done(result=0)
         self.assertEqual(self._called, False)
         self.assertEqual(FakeAreYouSure.shown, False)

=== modified file 'ubuntuone_installer/gui/qt/utils/linux.py'
--- ubuntuone_installer/gui/qt/utils/linux.py	2011-09-07 20:34:19 +0000
+++ ubuntuone_installer/gui/qt/utils/linux.py	2011-09-15 19:59:23 +0000
@@ -29,7 +29,7 @@
 
 def start_control_panel():
     """Start the control panel."""
-    subprocess.Popen(["ubuntuone-control-panel-qt", ])
+    subprocess.Popen(["ubuntuone-control-panel-qt"])
 
 
 def remove_syncdaemon_from_autostart():

=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_linux.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_linux.py	2011-08-30 14:11:48 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_linux.py	2011-09-15 19:59:23 +0000
@@ -19,11 +19,26 @@
 """Tests for the platform specific functions."""
 
 import os
+import subprocess
 
 from ubuntuone_installer.gui.qt import utils
 from ubuntuone_installer.gui.qt.tests import BaseTestCase
 
 
+class StartControlPanelTestCase(BaseTestCase):
+
+    """Test the start of the control panel."""
+
+    def test_start_control_panel(self):
+        """The proper process is started."""
+        self.patch(subprocess, "Popen", self._set_called)
+
+        utils.start_control_panel()
+
+        expected = ((['ubuntuone-control-panel-qt'],), {})
+        self.assertEqual(self._called, expected)
+
+
 class DefaultFoldersTestCase(BaseTestCase):
 
     """Test the default suggested UDFs."""

=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-13 14:43:39 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-15 19:59:23 +0000
@@ -20,6 +20,7 @@
 
 import sys
 import os
+import subprocess
 
 # Avoid pylint error on Linux
 # pylint: disable=F0401
@@ -31,6 +32,7 @@
 
 
 class UninstallerTestCase(BaseTestCase):
+
     """Test the uninstaller."""
 
     def test_execute_uninstall_on_licence_cancel_file_not_exists(self):
@@ -86,8 +88,44 @@
         self.assertEqual(0, self._called[0][5])
 
 
+class StartControlPanelTestCase(BaseTestCase):
+
+    """Test the start of the control panel."""
+
+    def test_start_control_panel(self):
+        """The proper process is started."""
+        self.patch(subprocess, "Popen", self._set_called)
+
+        utils.start_control_panel()
+
+        expected = ((['ubuntuone-control-panel-qt', '--with-icon'],), {})
+        self.assertEqual(self._called, expected)
+
+    def test_start_control_panel_frozen(self):
+        """When frozen, the control-panel has a path."""
+        # I can't patch sys because frozen is not there by default
+        sys.frozen = True
+        self.addCleanup(delattr, sys, 'frozen')
+
+        root = 'Z:\\Yadda\\Yoo'
+        self.patch(os.path, 'abspath', lambda p: os.path.join(root, p))
+        self.patch(os.path, 'dirname', lambda p: p)
+        exe = 'foo\\bar\\baz\\'
+        self.patch(sys, 'executable', exe)
+
+        self.patch(subprocess, "Popen", self._set_called)
+
+        utils.start_control_panel()
+
+        path = os.path.join(root, exe, 'ubuntuone-control-panel-qt.exe')
+        expected = (([path, '--with-icon'],), {})
+        self.assertEqual(self._called, expected)
+
+
 class FakeRegistry(object):
+
     """A fake registry."""
+
     # pylint: disable=C0103
     HKEY_CURRENT_USER = 2
     KEY_ALL_ACCESS = 4
@@ -126,6 +164,7 @@
 
 
 class AutostartTestCase(BaseTestCase):
+
     """Test add_syncdaemon_to_autostart."""
 
     def setUp(self):
@@ -138,12 +177,7 @@
         """Check that the registry is updated correctly."""
         # I can't patch sys because frozen is not there by default
         sys.frozen = True
-
-        def clean_frozen():
-            """Remove sys.frozen."""
-            del sys.frozen
-
-        self.addCleanup(clean_frozen)
+        self.addCleanup(delattr, sys, 'frozen')
         utils.windows.add_syncdaemon_to_autostart()
         self.assertEqual(self.registry.connect_args,
             ((None, self.registry.HKEY_CURRENT_USER), {}))

=== 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 19:59:23 +0000
@@ -52,12 +52,11 @@
     # If we are in windows and "frozen", assume it's in
     # the same folder as this .exe
     if hasattr(sys, "frozen"):
-        cp_path = os.path.join(os.path.dirname(
-            os.path.abspath(sys.executable)),
-            "ubuntuone-control-panel-qt.exe")
+        cp_dir = os.path.dirname(os.path.abspath(sys.executable))
+        cp_path = os.path.join(cp_dir, "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():