Merge lp:~ralsina/ubuntuone-windows-installer/put-in-autostart into lp:ubuntuone-windows-installer

[Roberto Alsina]

* Adds a missing image to the final page of the wizard
* Adds syncdaemon to autostart

* Adds a missing image to the final page of the wizard
* Adds syncdaemon to autostart

[Natalia Bidart (nataliabidart)]

ubuntuone_installer/gui/qt/utils/tests/test_windows.py:
    96: [C0301] Line too long (89/79)
    97: [C0301] Line too long (148/79)
    73: [C0103, FakeRegistry.ConnectRegistry] Invalid name "ConnectRegistry" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    73: [C0111, FakeRegistry.ConnectRegistry] Missing docstring
    77: [C0103, FakeRegistry.OpenKey] Invalid name "OpenKey" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    77: [C0111, FakeRegistry.OpenKey] Missing docstring
    81: [C0103, FakeRegistry.CloseKey] Invalid name "CloseKey" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    81: [C0111, FakeRegistry.CloseKey] Missing docstring
    84: [C0103, FakeRegistry.QueryValueEx] Invalid name "QueryValueEx" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    84: [C0111, FakeRegistry.QueryValueEx] Missing docstring
    85: [W0201, FakeRegistry.QueryValueEx] Attribute 'query_args' defined outside __init__
    78: [W0201, FakeRegistry.OpenKey] Attribute 'openkey_args' defined outside __init__
    82: [W0201, FakeRegistry.CloseKey] Attribute 'closekey_args' defined outside __init__
    74: [W0201, FakeRegistry.ConnectRegistry] Attribute 'connect_args' defined outside __init__
    27: [W0611] Unused import _winreg

ubuntuone_installer/gui/qt/utils/windows.py:
    74: [C0301] Line too long (112/79)
    78: [E0602, add_syncdaemon_to_autostart] Undefined variable 'WindowsError'

review: Needs Fixing

[Roberto Alsina (ralsina)]

Most of those were a missing push, the last one only appears on Linux, so added a disable for it.

[Leo Arias (elopio)]

Why did you kept the empty label?

+ <string/>

[Roberto Alsina (ralsina)]

> Why did you kept the empty label?
>
> + <string/>

There is probably going to be another branch to add an image there after design sees how this looks, and didn't want to make the diff grow more than what's needed.

[Leo Arias (elopio)]

Good. I still don't understand the whole registry thing, but you have my full confidence and a symbolic +1. :)

[Natalia Bidart (nataliabidart)]

The branch looks good, but after testing IRL I'm not sure that syncdaemon was added to the startup. Roberto said he will do some more work on this.

review: Needs Fixing

[Roberto Alsina (ralsina)]

The tests IRL don't work unless ubuntuone-windows-installer is a .exe file. You can test it with tonight's build that includes this branch.

[Natalia Bidart (nataliabidart)]

Tested IRL with the beta2 bundle and works fine.

review: Approve

[Natalia Bidart (nataliabidart)]

Oh, I just realized tests are broken:

Traceback (most recent call last):
  File "/home/nessita/canonical/u1/windows-installer/review_put-in-autostart/ubuntuone_installer/gui/qt/tests/test_gui.py", line 153, in setUp
    self.patch(gui.utils, "add_syncdaemon_to_autostart", NO_OP)
exceptions.AttributeError: 'module' object has no attribute 'utils'

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/put-in-autostart]

61. By Roberto Alsina on 2011-09-12

fix tests

62. By Roberto Alsina on 2011-09-12

pep8

63. By Roberto Alsina on 2011-09-12

cleaner fix for set_up_button noise.

64. By Roberto Alsina on 2011-09-12

added missing super call

65. By Roberto Alsina on 2011-09-12

ARGH

66. By Roberto Alsina on 2011-09-12

push

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'data/qt/congratulations.ui'
--- data/qt/congratulations.ui	2011-09-02 12:58:29 +0000
+++ data/qt/congratulations.ui	2011-09-12 19:52:24 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>521</width>
-    <height>387</height>
+    <width>622</width>
+    <height>331</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -35,11 +35,44 @@
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Nice picture goes here</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="images.qrc">:/win_installer_graphic.png</pixmap>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
    </item>
    <item>
     <widget class="QLabel" name="label_3">
@@ -60,7 +93,7 @@
       <item>
        <widget class="QLabel" name="label_4">
         <property name="text">
-         <string>IMAGE GOES HERE?</string>
+         <string/>
         </property>
        </widget>
       </item>
@@ -109,6 +142,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="images.qrc"/>
+ </resources>
  <connections/>
 </ui>

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-09-08 14:18:30 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-09-12 19:52:24 +0000
@@ -243,6 +243,9 @@
         self.wizard().button(QtGui.QWizard.FinishButton).style().polish(
             self.wizard().button(QtGui.QWizard.FinishButton))
 
+        # Add syncdaemon to autostart
+        qt.utils.add_syncdaemon_to_autostart()
+
 
 class MainWindow(QtGui.QWizard):
 

=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-09-08 13:41:10 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	2011-09-12 19:52:24 +0000
@@ -178,25 +178,29 @@
         """Set set_up_button as default button when the page is shown."""
         # This method should stays here because if we move it to initializePage
         # set_up_button won't take the proper style for hover and press
-        self.set_up_button.setVisible(True)
-        self.set_up_button.setDefault(True)
-        if not self.set_up_button.isEnabled():
-            self.set_up_button.setProperty("DisabledState", True)
-            self.set_up_button.style().unpolish(self.set_up_button)
-            self.set_up_button.style().polish(self.set_up_button)
+        if self.set_up_button is not None:
+            self.set_up_button.setVisible(True)
+            self.set_up_button.setDefault(True)
+            if not self.set_up_button.isEnabled():
+                self.set_up_button.setProperty("DisabledState", True)
+                self.set_up_button.style().unpolish(self.set_up_button)
+                self.set_up_button.style().polish(self.set_up_button)
         self.connect(QtGui.QApplication.instance(),
             QtCore.SIGNAL("focusChanged(QWidget*, QWidget*)"),
             self.focus_changed)
+        super(SetupAccountPage, self).showEvent(event)
 
     def hideEvent(self, event):
         """Disconnect the focusChanged signal when the page change."""
-        self.set_up_button.setVisible(False)
+        if self.set_up_button is not None:
+            self.set_up_button.setVisible(False)
         try:
             self.disconnect(QtGui.QApplication.instance(),
                 QtCore.SIGNAL("focusChanged(QWidget*, QWidget*)"),
                 self.focus_changed)
         except TypeError:
             pass
+        super(SetupAccountPage, self).hideEvent(event)
 
 
 def is_min_required_password(password):

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-12 18:18:54 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-12 19:52:24 +0000
@@ -30,7 +30,7 @@
 
 from ubuntuone_installer.gui import NEXT
 from ubuntuone_installer.gui.qt import gui, forgotten, utils
-from ubuntuone_installer.gui.qt.tests import BaseTestCase
+from ubuntuone_installer.gui.qt.tests import BaseTestCase, NO_OP
 
 
 class FakeController(object):
@@ -150,6 +150,7 @@
         self.patch(gui, "LocalFoldersPage", FakeLocalFoldersPage)
         self.patch(qt.preferences, "PreferencesPanel", FakePreferencesPanel)
         self.patch(qt.folders, "FoldersPanel", FakeFoldersPanel)
+        self.patch(gui.qt.utils, "add_syncdaemon_to_autostart", NO_OP)
         super(MainWindowTestCase, self).setUp()
         setup_page = self.ui.page(self.ui.setup_account_page_id)
         setup_page.initializePage()
@@ -561,6 +562,16 @@
         QtCore.QCoreApplication.instance().processEvents()
         self.assertEqual(self.ui.result(), self.ui.Rejected)
 
+    def test_congratulations_adds_to_autostart(self):
+        """Test that syncdaemon is now on autostart."""
+        self.patch(gui.qt.utils, "add_syncdaemon_to_autostart",
+            self._set_called)
+        # Show the Congratulations page
+        self.ui.setStartId(self.ui.CONGRATULATIONS_PAGE)
+        self.ui.restart()
+        # Check if syncdaemon was added to autostart
+        self.assertEqual(self._called, ((), {}))
+
 
 class FakeSignal(object):
 

=== modified file 'ubuntuone_installer/gui/qt/tests/test_setup_account.py'
--- ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-09-07 14:15:39 +0000
+++ ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-09-12 19:52:24 +0000
@@ -229,7 +229,6 @@
         # so we don't rely on any SSO behaviour
         super(SetupAccountFakeWizardTestCase, self).setUp()
         self.patch(self.ui, 'wizard', FakeWizard)
-        self.patch(self.ui, "set_up_button", QtGui.QPushButton())
 
     def test_blank_name(self):
         """Status when the name field is blank (spaces).
@@ -322,3 +321,13 @@
         self.addCleanup(self.ui.hide)
         self.ui.focus_changed(None, self.ui.ui.password_edit)
         self.assertTrue(self.ui.ui.password_assistance.isVisible())
+
+    def test_hide_event(self):
+        """Check that hide_event works when set_up_button is none."""
+        self.assertEqual(self.ui.set_up_button, None)
+        self.ui.hideEvent(QtGui.QHideEvent())
+
+    def test_show_event(self):
+        """Check that show_event works when set_up_button is none."""
+        self.assertEqual(self.ui.set_up_button, None)
+        self.ui.showEvent(QtGui.QShowEvent())

=== modified file 'ubuntuone_installer/gui/qt/utils/__init__.py'
--- ubuntuone_installer/gui/qt/utils/__init__.py	2011-08-30 14:11:48 +0000
+++ ubuntuone_installer/gui/qt/utils/__init__.py	2011-09-12 19:52:24 +0000
@@ -26,9 +26,11 @@
     from ubuntuone_installer.gui.qt.utils import windows
     uninstall_application = windows.uninstall_application
     start_control_panel = windows.start_control_panel
+    add_syncdaemon_to_autostart = windows.add_syncdaemon_to_autostart
     default_folders = windows.default_folders
 else:
     from ubuntuone_installer.gui.qt.utils import linux
     uninstall_application = linux.uninstall_application
     start_control_panel = linux.start_control_panel
+    add_syncdaemon_to_autostart = linux.add_syncdaemon_to_autostart
     default_folders = linux.default_folders

=== modified file 'ubuntuone_installer/gui/qt/utils/linux.py'
--- ubuntuone_installer/gui/qt/utils/linux.py	2011-09-01 11:15:49 +0000
+++ ubuntuone_installer/gui/qt/utils/linux.py	2011-09-12 19:52:24 +0000
@@ -32,6 +32,14 @@
     subprocess.Popen(["ubuntuone-control-panel-qt", ])
 
 
+def remove_syncdaemon_from_autostart():
+    """Remove syncdaemon from the session's autostart."""
+
+
+def add_syncdaemon_to_autostart():
+    """Add syncdaemon to the session's autostart."""
+
+
 def default_folders():
     """Return a list of the folders to add by default."""
     # FIXME: this should be taken from ~/.config/user-dirs.dirs

=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-01 18:25:44 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-12 19:52:24 +0000
@@ -86,6 +86,89 @@
         self.assertTrue(0 == self._called[0][5])
 
 
+class FakeRegistry(object):
+    """A fake registry."""
+    # pylint: disable=C0103
+    HKEY_CURRENT_USER = 2
+    KEY_ALL_ACCESS = 4
+    REG_SZ = 1
+
+    def __init__(self):
+        self.HKEY_CURRENT_USER = 2
+        self.KEY_ALL_ACCESS = 4
+        self.connect_args = None
+        self.openkey_args = None
+        self.closekey_args = None
+        self.query_args = None
+        self.set_args = []
+
+    def ConnectRegistry(self, *args, **kwargs):
+        """Fake ConnectRegistry."""
+        self.connect_args = (args, kwargs)
+        return "REGISTRY"
+
+    def OpenKey(self, *args, **kwargs):
+        """Fake OpenKey."""
+        self.openkey_args = (args, kwargs)
+        return "KEY"
+
+    def CloseKey(self, *args, **kwargs):
+        """Fake CloseKey."""
+        self.closekey_args = (args, kwargs)
+
+    def QueryValueEx(self, *args, **kwargs):
+        """Fake QueryValueEx."""
+        self.query_args = (args, kwargs)
+
+    def SetValueEx(self, *args, **kwargs):
+        """Fake SetValueEx."""
+        self.set_args.append((args, kwargs))
+
+
+class AutostartTestCase(BaseTestCase):
+    """Test add_syncdaemon_to_autostart."""
+
+    def setUp(self):
+        """Initialize this test instance."""
+        self.registry = FakeRegistry()
+        self.patch(utils.windows, "_winreg", self.registry)
+        super(AutostartTestCase, self).setUp()
+
+    def test_add_syncdaemon_to_autostart(self):
+        """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)
+        utils.windows.add_syncdaemon_to_autostart()
+        self.assertEqual(self.registry.connect_args,
+            ((None, self.registry.HKEY_CURRENT_USER), {}))
+        self.assertEqual(self.registry.openkey_args,
+            (('REGISTRY', utils.windows.AUTORUN_KEY, 0,
+              self.registry.KEY_ALL_ACCESS), {}))
+        self.assertEqual(self.registry.closekey_args, (('KEY',), {}))
+        self.assertEqual(self.registry.query_args, None)
+        self.assertEqual(self.registry.set_args,
+             [(('KEY', 'Ubuntu One', 0, 1,
+             'C:\\Python27\\ubuntuone-syncdaemon.exe'), {}),
+             (('KEY',  'Ubuntu One Icon', 0, 1,
+             'C:\\Python27\\ubuntuone-control-panel-qt.exe --minimized'),
+             {})])
+
+    def test_not_added_if_not_frozen(self):
+        """Not frozen binaries are not added to the registry."""
+        utils.windows.add_syncdaemon_to_autostart()
+        self.assertEqual(self.registry.connect_args, None)
+        self.assertEqual(self.registry.openkey_args, None)
+        self.assertEqual(self.registry.closekey_args, None)
+        self.assertEqual(self.registry.query_args, None)
+        self.assertEqual(self.registry.set_args, [])
+
+
 class DefaultFoldersTestCase(BaseTestCase):
 
     """Test the default suggested UDFs."""

=== modified file 'ubuntuone_installer/gui/qt/utils/windows.py'
--- ubuntuone_installer/gui/qt/utils/windows.py	2011-09-01 10:32:51 +0000
+++ ubuntuone_installer/gui/qt/utils/windows.py	2011-09-12 19:52:24 +0000
@@ -19,6 +19,7 @@
 """Utils Functions Windows specific."""
 
 
+import ctypes
 import os
 import subprocess
 import sys
@@ -26,8 +27,10 @@
 # Avoid pylint error on Linux
 # pylint: disable=F0401
 import win32api
+import _winreg
 # pylint: enable=F0401
-import ctypes
+
+AUTORUN_KEY = r"Software\Microsoft\Windows\CurrentVersion\Run"
 
 
 def uninstall_application():
@@ -48,7 +51,7 @@
     """Start the control panel."""
     # 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"):
+    if hasattr(sys, "frozen"):
         cp_path = os.path.join(os.path.dirname(
             os.path.abspath(sys.executable)),
             "ubuntuone-control-panel-qt.exe")
@@ -57,6 +60,28 @@
     subprocess.Popen([cp_path, ])
 
 
+def add_syncdaemon_to_autostart():
+    """Add syncdaemon to the session's autostart."""
+    if hasattr(sys, "frozen"):
+        sd_path = os.path.join(os.path.dirname(
+            os.path.abspath(sys.executable)),
+            "ubuntuone-syncdaemon.exe")
+        u1cp_path = os.path.join(os.path.dirname(
+            os.path.abspath(sys.executable)),
+            "ubuntuone-control-panel-qt.exe")
+    else:
+        return
+    registry = _winreg.ConnectRegistry(None, _winreg.HKEY_CURRENT_USER)
+    key = _winreg.OpenKey(registry,
+        AUTORUN_KEY,
+        0, _winreg.KEY_ALL_ACCESS)
+    # pylint: disable=E0602
+    _winreg.SetValueEx(key, "Ubuntu One", 0, _winreg.REG_SZ, sd_path)
+    _winreg.SetValueEx(key, "Ubuntu One Icon", 0, _winreg.REG_SZ,
+        u1cp_path + " --minimized")
+    _winreg.CloseKey(key)
+
+
 def default_folders():
     """Return a list of the folders to add by default."""
     # XXXX to be replaced by calls to xdg_base_directory's