Merge lp:~brian.curtin/ubuntuone-control-panel/windows-autostart into lp:ubuntuone-control-panel

[Brian Curtin]

- Implemented add_to_autostart to put Ubuntu One into the Windows autostart registry key. This was originally in ubuntuone-windows-installer in a slightly different form.

Implement add_to_autostart to put SD into the Windows autostart registry key. This was originally in ubuntuone-windows-installer in a slightly different form.

This proposal also depends on the following branches:
lp:~brian.curtin/ubuntuone-control-panel/no-symlinks-on-windows
lp:~brian.curtin/ubuntuone-control-panel/nessitas-crash-fix

[Natalia Bidart (nataliabidart)]

Roberto's proposal changed, so this diff is shwoing stuff that it shouldn't.

Would you please update your branch pulling the latest changes from all your dependency branches? Thanks!!!

[lp:~brian.curtin/ubuntuone-control-panel/windows-autostart]

298. By Brian Curtin on 2012-03-22

Move the symlink part of build_test_dir out to its own test class
so we can skip it on Windows.

299. By Brian Curtin on 2012-03-22

merge trunk

[Natalia Bidart (nataliabidart)]

Now I'm getting all these errors:

[ERROR]
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/home/nessita/canonical/controlpanel/review_no-symlinks-on-windows/ubuntuone/controlpanel/gui/qt/tests/test_gui.py", line 126, in setUp
    self.patch(gui, "add_to_autostart", self._set_called)
  File "/usr/lib/python2.7/dist-packages/twisted/trial/unittest.py", line 1073, in patch
    monkeyPatch.patch()
  File "/usr/lib/python2.7/dist-packages/twisted/python/monkey.py", line 51, in patch
    self._originals.append((obj, name, getattr(obj, name)))
exceptions.AttributeError: 'module' object has no attribute 'add_to_autostart'

ubuntuone.controlpanel.gui.qt.tests.test_gui.AutoStartTestCase.test_add_to_autostart
ubuntuone.controlpanel.gui.qt.tests.test_gui.AutoStartTestCase.test_backend_is_correct
ubuntuone.controlpanel.gui.qt.tests.test_gui.AutoStartTestCase.test_close_callback_can_be_none
ubuntuone.controlpanel.gui.qt.tests.test_gui.AutoStartTestCase.test_close_event_calls_custom_close_callback
ubuntuone.controlpanel.gui.qt.tests.test_gui.AutoStartTestCase.test_focus_in
ubuntuone.controlpanel.gui.qt.tests.test_gui.AutoStartTestCase.test_init_loads_ui
ubuntuone.controlpanel.gui.qt.tests.test_gui.AutoStartTestCase.test_on_signin_canceled
ubuntuone.controlpanel.gui.qt.tests.test_gui.AutoStartTestCase.test_quit_action
ubuntuone.controlpanel.gui.qt.tests.test_gui.AutoStartTestCase.test_set_urgent
ubuntuone.controlpanel.gui.qt.tests.test_gui.AutoStartTestCase.test_switch_to

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

The code here was already covered by other 2 proposals, so rejecting this branch.

review: Disapprove

Unmerged revisions

299. By Brian Curtin on 2012-03-22

merge trunk

298. By Brian Curtin on 2012-03-22

Move the symlink part of build_test_dir out to its own test class
so we can skip it on Windows.

297. By Brian Curtin on 2012-03-21

Undo a previous incorrect change to a version of run-tests.bat

296. By Brian Curtin on 2012-03-21

merge lp:~brian.curtin/ubuntuone-control-panel/no-symlinks-on-windows

295. By Brian Curtin on 2012-03-21

merge lp:~brian.curtin/ubuntuone-control-panel/nessitas-crash-fix

294. By Brian Curtin on 2012-03-21

merge lp:~brian.curtin/ubuntuone-control-panel/windows-autostart

=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-03-21 19:17:21 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-03-22 14:10:24 +0000
@@ -18,6 +18,7 @@
 
 from PyQt4 import QtGui, QtCore
 
+from ubuntuone.controlpanel.utils import add_to_autostart
 from ubuntuone.controlpanel.gui.qt.systray import TrayIcon
 from ubuntuone.controlpanel.gui.qt.ui import mainwindow_ui
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-19 20:51:26 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-22 14:10:24 +0000
@@ -22,10 +22,12 @@
 import os
 import Queue
 import shutil
+import sys
 
 from PyQt4 import QtGui
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.devtools.testcases import skipIfOS
 
 from ubuntuone.controlpanel.tests import helper_fail
 from ubuntuone.controlpanel.gui.tests import (
@@ -694,10 +696,6 @@
         empty_dir = os.path.join(dir_path, 'empty')
         os.mkdir(empty_dir)
 
-        # add a symlink to confirm those are avoided
-        a_link = os.path.join(dir_path, 'some_link')
-        os.symlink(a_file, a_link)
-
         return total_size
 
 
@@ -733,6 +731,28 @@
         self.assertRaises(Queue.Empty, self.queue.get, block=True, timeout=0.5)
 
 
+@skipIfOS("win32", "Windows does not easily support symlinks")
+class CalculateSizeWithSymlinksTestCase(BaseLocalFoldersTestCase):
+    """Test suite for the CalculateSize thread implementation."""
+
+    def build_test_dir(self, dir_path):
+        """Build a testing directory hierarchy."""
+        total_size = super(CalculateSizeWithSymlinksTestCase,
+                           self).build_test_dir(dir_path)
+
+        a_file = os.path.join(dir_path, 'to_be_symlinked')
+        with open(a_file, 'wb') as f:
+            f.write('y' * 5000)
+
+        total_size += os.path.getsize(a_file)
+
+        # add a symlink to confirm those are avoided
+        a_link = os.path.join(dir_path, 'some_link')
+        os.symlink(a_file, a_link)
+
+        return total_size
+
+
 class FakedCalculateSize(object):
     """A faked CalculateSize thread."""
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-03-09 01:05:49 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-03-22 14:10:24 +0000
@@ -18,6 +18,8 @@
 
 """Tests for the Qt UI."""
 
+from twisted.internet import defer
+
 from ubuntuone.controlpanel.gui.qt import gui
 from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
 
@@ -115,3 +117,14 @@
         self.patch(self.ui, "entry", entry)
         self.ui.set_urgent("foo")
         self.assertEqual(entry.called, (('urgent', "foo"), {}))
+
+
+class AutoStartTestCase(MainWindowTestCase):
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        self.patch(gui, "add_to_autostart", self._set_called)
+        yield super(AutoStartTestCase, self).setUp()
+
+    def test_add_to_autostart(self):
+        self.assertTrue(self._called)

=== modified file 'ubuntuone/controlpanel/gui/qt/wizard.py'
--- ubuntuone/controlpanel/gui/qt/wizard.py	2012-03-22 12:43:53 +0000
+++ ubuntuone/controlpanel/gui/qt/wizard.py	2012-03-22 14:10:24 +0000
@@ -24,6 +24,7 @@
 from ubuntu_sso.utils.ui import CLOSE_AND_SETUP_LATER
 
 from ubuntuone.controlpanel import cache
+from ubuntuone.controlpanel.utils import add_to_autostart
 from ubuntuone.controlpanel.logger import log_call, setup_logging
 from ubuntuone.controlpanel.gui import (
     APP_NAME,
@@ -281,6 +282,13 @@
             self.side_widget.stage = stage
 
     @log_call(logger.info)
+    def start_from_license(self):
+        """Use the license page as first page."""
+        # license
+        self.setStartId(self.pages[self.license_page])
+        self.restart()
+
+    @log_call(logger.info)
     def cleanupPage(self, page_id):
         """Called clean up 'page_id' just before the user leaves it."""
         page = self.page(page_id)
@@ -345,3 +353,5 @@
                 self.rejected.emit()
         else:
             super(UbuntuOneWizard, self).done(result)
+
+        add_to_autostart()

=== modified file 'ubuntuone/controlpanel/utils/__init__.py'
--- ubuntuone/controlpanel/utils/__init__.py	2012-03-16 16:40:27 +0000
+++ ubuntuone/controlpanel/utils/__init__.py	2012-03-22 14:10:24 +0000
@@ -38,11 +38,13 @@
     are_updates_present = windows.are_updates_present
     default_folders = windows.default_folders
     perform_update = windows.perform_update
+    add_to_autostart = windows.add_to_autostart
 else:
     from ubuntuone.controlpanel.utils import linux
     are_updates_present = lambda *args, **kwargs: False
     default_folders = linux.default_folders
     perform_update = lambda *args, **kwargs: None
+    add_to_autostart = lambda *args, **kwargs: None
 
 # pylint: enable=C0103
 

=== modified file 'ubuntuone/controlpanel/utils/tests/test_windows.py'
--- ubuntuone/controlpanel/utils/tests/test_windows.py	2012-03-16 19:55:22 +0000
+++ ubuntuone/controlpanel/utils/tests/test_windows.py	2012-03-22 14:10:24 +0000
@@ -18,6 +18,7 @@
 """Test the windows utils functions."""
 
 import os
+import sys
 
 from twisted.internet import defer
 
@@ -87,6 +88,88 @@
         self.assertEqual(0, self._called[0][5])
 
 
+class FakeOpenKey(object):
+
+    def __init__(self):
+        self.openkey_args = None
+        super(FakeOpenKey, self).__init__()
+
+    def __call__(self, *args, **kwargs):
+        self.openkey_args = (args, kwargs)
+        return self
+
+    def __enter__(self, *args, **kwargs):
+        #self.openkey_args = (args, kwargs)
+        return self
+
+    def __exit__(self, *args):
+        pass
+
+
+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.openkey_args = None
+        self.query_args = None
+        self.set_args = []
+
+        self.OpenKey = FakeOpenKey()
+
+    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(TestCase):
+
+    """Test add_syncdaemon_to_autostart."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Initialize this test instance."""
+        self.registry = FakeRegistry()
+        self.patch(utils.windows, "_winreg", self.registry)
+        yield 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
+        self.addCleanup(delattr, sys, 'frozen')
+        utils.windows.add_to_autostart()
+        self.assertEqual(self.registry.OpenKey.openkey_args,
+            ((self.registry.HKEY_CURRENT_USER, utils.windows.AUTORUN_KEY, 0,
+              self.registry.KEY_ALL_ACCESS), {}))
+        self.assertEqual(self.registry.query_args, None)
+        dir = os.path.dirname(os.path.abspath(sys.executable))
+        self.assertEqual(self.registry.set_args,
+             [((self.registry.OpenKey, 'Ubuntu One', 0, 1,
+             '"%s\\ubuntuone-syncdaemon.exe"' % dir), {}),
+             ((self.registry.OpenKey, 'Ubuntu One Icon', 0, 1,
+             '"%s\\ubuntuone-control-panel-qt.exe" --minimized' % dir),
+             {})])
+
+    def test_not_added_if_not_frozen(self):
+        """Not frozen binaries are not added to the registry."""
+        utils.windows.add_to_autostart()
+        self.assertEqual(self.registry.openkey_args, None)
+        self.assertEqual(self.registry.query_args, None)
+        self.assertEqual(self.registry.set_args, [])
+
+
 class DefaultFoldersTestCase(TestCase):
     """Test the default_folders method."""
 

=== modified file 'ubuntuone/controlpanel/utils/windows.py'
--- ubuntuone/controlpanel/utils/windows.py	2012-03-16 19:55:22 +0000
+++ ubuntuone/controlpanel/utils/windows.py	2012-03-22 14:10:24 +0000
@@ -19,6 +19,7 @@
 
 import os
 import sys
+import _winreg
 
 # Avoid pylint error on Linux
 # pylint: disable=F0401
@@ -33,6 +34,7 @@
 
 logger = setup_logging('utils.windows')
 AUTOUPDATE_EXE_NAME = 'autoupdate-windows.exe'
+AUTORUN_KEY = r"Software\Microsoft\Windows\CurrentVersion\Run"
 
 
 def _get_update_path():
@@ -96,3 +98,23 @@
         win32api.ShellExecute(None, 'runas',
             update_path,
             '--unattendedmodeui none', '', 0)
+
+
+def add_to_autostart():
+    """Add syncdaemon to the session's autostart."""
+    if getattr(sys, "frozen", False):
+        sd_path = '"%s"' % os.path.join(os.path.dirname(
+            os.path.abspath(sys.executable)),
+            "ubuntuone-syncdaemon.exe")
+        u1cp_path = '"%s"' % os.path.join(os.path.dirname(
+            os.path.abspath(sys.executable)),
+            "ubuntuone-control-panel-qt.exe")
+    else:
+        return
+
+    with _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, AUTORUN_KEY,
+                         0, _winreg.KEY_ALL_ACCESS) as key:
+        # 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")