Merge lp:~dobey/ubuntuone-control-panel/update-4-0 into lp:ubuntuone-control-panel/stable-4-0

[dobey]

[Diego Sarmentero]

    - Accept mouse events in shares search pop-up list. (LP: #1056192)

[Mike McCracken]

    - Use darwin ServiceManagement API to install/check/upgrade fsevents daemon.

[Brian Curtin]

    - Use os.path.join to construct platform-safe paths in share links tests.

[Mike McCracken (mikemc)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-4-0 into lp:ubuntuone-control-panel/stable-4-0 failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
    t...

=== modified file 'ubuntuone/controlpanel/gui/qt/share_file.py'
--- ubuntuone/controlpanel/gui/qt/share_file.py	2012-08-27 15:00:01 +0000
+++ ubuntuone/controlpanel/gui/qt/share_file.py	2012-10-02 18:05:36 +0000
@@ -20,6 +20,8 @@
 
 from PyQt4 import QtGui, QtCore
 
+from ubuntuone.platform import expand_user
+
 from ubuntuone.controlpanel import cache
 from ubuntuone.controlpanel.gui.qt.share_links_search import (
     get_system_icon_for_filename,
@@ -40,11 +42,12 @@
         super(ShareFileWidget, self).__init__(*args, **kwargs)
         self.ui = share_file_ui.Ui_Form()
         self.ui.setupUi(self)
-        self.file_path = file_path
+        full_path = expand_user(file_path.encode('utf-8'))
+        self.file_path = full_path.decode('utf-8')
 
         self.ui.lbl_filename.setText(os.path.basename(file_path))
         self.ui.lbl_path.setText(file_path)
-        icon = get_system_icon_for_filename(os.path.expanduser(file_path))
+        icon = get_system_icon_for_filename(full_path)
         pixmap = icon.pixmap(24)
         self.ui.lbl_icon.setPixmap(pixmap)
 
@@ -53,11 +56,10 @@
 
     def open_file(self):
         """Open the specified file."""
-        path = u'file://%s' % self.file_path
+        path = 'file://%s' % self.file_path
         QtGui.QDesktopServices.openUrl(QtCore.QUrl(path))
 
     def disable_link(self, val):
         """Change the access of the file to Not Public."""
-        self.backend.change_public_access(
-            os.path.expanduser(self.file_path), False)
+        self.backend.change_public_access(self.file_path, False)
         self.linkDisabled.emit()

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links.py'
--- ubuntuone/controlpanel/gui/qt/share_links.py	2012-08-27 15:00:01 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links.py	2012-10-02 18:05:36 +0000
@@ -21,6 +21,8 @@
 from PyQt4 import QtGui, QtCore
 from twisted.internet.defer import inlineCallbacks
 
+from ubuntuone.platform import expand_user
+
 from ubuntuone.controlpanel.logger import setup_logging
 from ubuntuone.controlpanel.gui import (
     COPY_LINK,
@@ -57,6 +59,7 @@
     logger = logger
     _enhanced_line = None
     home_dir = ''
+    _shared_files = {}
 
     def _setup(self):
         """Do some extra setupping for the UI."""
@@ -91,17 +94,26 @@
     @inlineCallbacks
     def share_file(self, file_path):
         """Clean the previous file share details and publish file_path."""
+        file_path = unicode(file_path)
         if self.ui.hbox_share_file.count() > 0:
             widget = self.ui.hbox_share_file.takeAt(0).widget()
             widget.close()
-        self.is_processing = True
-        file_path = unicode(file_path)
-        share_file_widget = ShareFileWidget(file_path)
-        self.ui.hbox_share_file.addWidget(share_file_widget)
-        share_file_widget.linkDisabled.connect(
-            lambda: self.ui.line_copy_link.setText(''))
-        yield self.backend.change_public_access(
-            os.path.expanduser(file_path), True)
+        full_path = expand_user(file_path.encode('utf-8')).decode('utf-8')
+        if full_path not in self._shared_files:
+            self.is_processing = True
+            share_file_widget = ShareFileWidget(file_path)
+            self.ui.hbox_share_file.addWidget(share_file_widget)
+            share_file_widget.linkDisabled.connect(
+                lambda: self.ui.line_copy_link.setText(''))
+            yield self.backend.change_public_access(
+                full_path, True)
+        else:
+            share_file_widget = ShareFileWidget(file_path)
+            self.ui.hbox_share_file.addWidget(share_file_widget)
+            share_file_widget.linkDisabled.connect(
+                lambda: self.ui.line_copy_link.setText(''))
+            self.ui.line_copy_link.setText(self._shared_files[full_path])
+            self.ui.stacked_widget.setCurrentIndex(1)
 
     def _file_shared(self, info):
         """Receive the notification that the file has been published."""
@@ -135,17 +147,19 @@
     def _load_public_files(self, publicfiles):
         """Load the list of public files."""
         self.ui.tree_shared_files.clear()
+        self._shared_files = {}
         for pfile in publicfiles:
             item = QtGui.QTreeWidgetItem()
             path = pfile['path']
             public_url = pfile['public_url']
+            self._shared_files[path] = public_url
             name = os.path.basename(path)
             item.setText(FILE_NAME_COL, name)
             tooltip = path
             if tooltip.startswith(self.home_dir):
                 tooltip = tooltip.replace(self.home_dir, '~', 1)
             item.setToolTip(FILE_NAME_COL, tooltip)
-            icon = get_system_icon_for_filename(path)
+            icon = get_system_icon_for_filename(path.encode('utf-8'))
             item.setIcon(FILE_NAME_COL, icon)
 
             self.ui.tree_shared_files.setColumnWidth(PUBLIC_LINK_COL, 300)

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-09-14 20:23:13 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-10-02 18:05:36 +0000
@@ -21,6 +21,8 @@
 from PyQt4 import QtGui, QtCore
 from twisted.internet.defer import inlineCallbacks
 
+from ubuntuone.platform import expand_user
+
 from ubuntuone.controlpanel import cache
 from ubuntuone.controlpanel.logger import setup_logging
 
@@ -29,7 +31,7 @@
 
 def get_system_icon_for_filename(file_path):
     """Return the icon used for the system to represent this file."""
-    fileinfo = QtCore.QFileInfo(os.path.expanduser(file_path))
+    fileinfo = QtCore.QFileInfo(expand_user(file_path))
     icon_provider = QtGui.QFileIconProvider()
     icon = icon_provider.icon(fileinfo)
     return icon
@@ -65,10 +67,19 @@
             QtCore.Qt.Key_Enter: self._key_return_pressed,
         }
 
+        self.popup.list_widget.itemPressed.connect(self._set_selected_item)
+        self.popup.list_widget.verticalScrollBar().valueChanged.connect(
+            self._scroll_fetch_more)
         self.textChanged.connect(self.filter)
 
         self._get_volumes_info()
 
+    def _scroll_fetch_more(self, value):
+        """Fetch more items into the list on scroll."""
+        if self.popup.list_widget.verticalScrollBar().maximum() == value:
+            filenames = self._get_filtered_list(self.temp_u1_files)
+            self.popup.fetch_more(filenames)
+
     @inlineCallbacks
     def _get_volumes_info(self):
         """Get the volumes info."""
@@ -260,7 +271,7 @@
             file_widget = FileItem(file_)
             self.list_widget.addItem(item)
             self.list_widget.setItemWidget(item, file_widget)
-            icon = get_system_icon_for_filename(file_)
+            icon = get_system_icon_for_filename(file_.encode('utf-8'))
             item.setIcon(icon)
         if file_items:
             self.list_widget.setCurrentRow(0)
@@ -272,7 +283,7 @@
             file_widget = FileItem(file_)
             self.list_widget.addItem(item)
             self.list_widget.setItemWidget(item, file_widget)
-            icon = get_system_icon_for_filename(file_)
+            icon = get_system_icon_for_filename(file_.encode('utf-8'))
             item.setIcon(icon)
 
     def showEvent(self, event):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_file.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_file.py	2012-08-28 00:32:41 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_file.py	2012-10-02 18:05:36 +0000
@@ -20,6 +20,8 @@
 
 from PyQt4 import QtGui, QtCore
 
+from ubuntuone.platform import expand_user
+
 from ubuntuone.controlpanel.gui.qt import share_file as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     BaseTestCase,
@@ -54,7 +56,7 @@
         self.patch(QtGui, "QDesktopServices", fake_desktop_service)
         self.ui.ui.btn_open.click()
 
-        expected = QtCore.QUrl(u'file://%s' % self.file_path)
+        expected = QtCore.QUrl('file://%s' % self.file_path)
         self.assertEqual(expected, fake_desktop_service.opened_url)
 
     def test_disable_link(self):
@@ -71,6 +73,7 @@
             fake_change_access)
         self.ui.ui.btn_disable.click()
 
-        expected = [os.path.expanduser(self.file_path), False]
+        expected = [expand_user(
+            self.file_path.encode('utf-8')).decode('utf-8'), False]
         self.assertEqual(data, expected)
         self.assertEqual(self._called, ((), {}))

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-08-28 00:32:41 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-10-02 18:05:36 +0000
@@ -78,6 +78,24 @@
         self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 1)
         self.assertFalse(self.ui.is_processing)
 
+    def test_file_already_shared(self):
+        """Check the behavior of the widgets when there is a shared file."""
+        data = []
+
+        def fake_method(self, *args):
+            """Fake callback."""
+            data.append((args))
+
+        self.patch(self.ui.backend, "change_public_access", fake_method)
+        path = '/home/user/Ubuntu One/file1.txt'
+        shared = {
+            '/home/user/Ubuntu One/file1.txt': 'http://ubuntuone.com/asd123'}
+        self.ui._shared_files = shared
+        self.ui.share_file(path)
+        self.assertEqual(self.ui.ui.line_copy_link.text(), shared[path])
+        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 1)
+        self.assertEqual(data, [])
+
     def test_open_in_browser(self):
         """Test the execution of open_in_browser."""
         fake_desktop_service = FakeDesktopService()

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-09-14 20:23:13 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-10-02 18:05:36 +0000
@@ -18,6 +18,7 @@
 
 import os
 
+from dirspec import utils
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.tests import USER_HOME
@@ -27,6 +28,7 @@
 
 # pylint: disable=W0212
 
+
 class SearchBoxTestCase(BaseTestCase):
     """Test the qt control panel."""
 
@@ -36,6 +38,7 @@
     def setUp(self):
         yield super(SearchBoxTestCase, self).setUp()
 
+        self.patch(utils, "user_home", USER_HOME)
         self.patch(self.ui._thread_explore, "get_folder_info",
             self.fake_get_folder_info)
         self.patch(self.ui._thread_explore, "start",
@@ -52,6 +55,11 @@
                 os.path.join(USER_HOME, 'blabla', 'iop'),
             ]
         }
+        self._slot_item = None
+
+    def fake_slot(self, item):
+        """Fake function to be called when itemSelected is emitted."""
+        self._slot_item = item
 
     def fake_get_folder_info(self, folder):
         """Fake get_folder_info."""
@@ -132,7 +140,33 @@
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
         self.ui.popup.list_widget.setCurrentRow(1)
         current = self.ui.popup.list_widget.currentRow()
+        self.ui.itemSelected.connect(self.fake_slot)
         self.ui._key_return_pressed(current)
+        expected = unicode(self._slot_item).replace('~', USER_HOME)
+        self.assertEqual(expected, self.folder_info['folder2'][2])
+
+    def test_mouse_click_pressed(self):
+        """Check the proper actions are executed when click is pressed."""
+        data1 = [{'path': 'folder1'}]
+        data2 = [{'realpath': 'folder2'}]
+        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.ui.popup.list_widget.setCurrentRow(1)
+        current = self.ui.popup.list_widget.currentItem()
+        self.ui.itemSelected.connect(self.fake_slot)
+        self.ui.popup.list_widget.itemPressed.emit(current)
+        expected = unicode(self._slot_item).replace('~', USER_HOME)
+        self.assertEqual(expected, self.folder_info['folder2'][2])
+
+    def test_mouse_scroll(self):
+        """Check that fetch_more is called when we reach the end of scroll."""
+        data1 = [{'path': 'folder1'}]
+        data2 = [{'realpath': 'folder2'}]
+        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.patch(self.ui.popup, "fetch_more", self._set_called)
+        self.ui._scroll_fetch_more(
+            self.ui.popup.list_widget.verticalScrollBar().maximum())
+        expected = (([],), {})
+        self.assertEqual(expected, self._called)
 
     def test_key_space_pressed(self):
         """Check the proper actions are executed on key space pressed."""
@@ -163,12 +197,12 @@
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
         expected = [
-            'other_path/test/qwe',
-            '~/blabla/iop',
-            '~/one/file3',
-            '~/test/asd',
-            '~/ubuntu/file1',
-            '~/ubuntu/file2']
+            os.path.join('other_path', 'test', 'qwe'),
+            os.path.join('~', 'blabla', 'iop'),
+            os.path.join('~', 'one', 'file3'),
+            os.path.join('~', 'test', 'asd'),
+            os.path.join('~', 'ubuntu', 'file1'),
+            os.path.join('~', 'ubuntu', 'file2')]
         self.assertEqual(self.ui._thread_explore.u1_files, expected)
         self.assertEqual(self.ui.popup.list_widget.count(), 6)
 
@@ -183,15 +217,15 @@
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
         self.ui.filter('p')
-        expected = ['~/blabla/iop']
+        expected = [os.path.join('~', 'blabla', 'iop')]
         self.assertEqual(expected, self.ui.temp_u1_files)
 
         self.ui.filter('i')
         expected = [
-            '~/blabla/iop',
-            '~/one/file3',
-            '~/ubuntu/file1',
-            '~/ubuntu/file2']
+            os.path.join('~', 'blabla', 'iop'),
+            os.path.join('~', 'one', 'file3'),
+            os.path.join('~', 'ubuntu', 'file1'),
+            os.path.join('~', 'ubuntu', 'file2')]
         self.assertEqual(expected, self.ui.temp_u1_files)
 
     def test_set_selected_item(self):
@@ -204,7 +238,8 @@
         self.ui.popup.list_widget.setCurrentRow(0)
         item = self.ui.popup.list_widget.currentItem()
         self.ui._set_selected_item(item)
-        self.assertEqual(self._called, ((u'other_path/test/qwe',), {}))
+        self.assertEqual(self._called,
+                ((os.path.join(u'other_path', u'test', u'qwe'),), {}))
         self.assertEqual(self.ui.text(), '')
 
 

=== modified file 'ubuntuone/controlpanel/utils/darwin.py'
--- ubuntuone/controlpanel/utils/darwin.py	2012-08-06 16:47:44 +0000
+++ ubuntuone/controlpanel/utils/darwin.py	2012-10-02 18:05:36 +0000
@@ -20,15 +20,322 @@
 import shutil
 import sys
 
+from ctypes import (
+    byref,
+    CDLL,
+    POINTER,
+    Structure,
+    c_bool,
+    c_char_p,
+    c_double,
+    c_int32,
+    c_long,
+    c_uint32,
+    c_void_p)
+
+from ctypes.util import find_library
+
 from twisted.internet import defer
 
 from dirspec.basedir import save_config_path
 from ubuntuone.controlpanel.logger import setup_logging
 
 logger = setup_logging('utils.darwin')
+
 AUTOUPDATE_BIN_NAME = 'autoupdate-darwin'
 UNINSTALL_BIN_NAME = 'uninstall-darwin'
 
+FSEVENTSD_JOB_LABEL = "com.ubuntu.one.fsevents"
+
+# pylint: disable=C0103
+CFPath = find_library("CoreFoundation")
+CF = CDLL(CFPath)
+
+CFRelease = CF.CFRelease
+CFRelease.restype = None
+CFRelease.argtypes = [c_void_p]
+
+kCFStringEncodingUTF8 = 0x08000100
+
+
+class CFRange(Structure):
+    """CFRange Struct"""
+    _fields_ = [("location", c_long),
+                ("length", c_long)]
+
+CFShow = CF.CFShow
+CFShow.argtypes = [c_void_p]
+CFShow.restype = None
+
+CFStringCreateWithCString = CF.CFStringCreateWithCString
+CFStringCreateWithCString.restype = c_void_p
+CFStringCreateWithCString.argtypes = [c_void_p, c_void_p, c_uint32]
+
+kCFAllocatorDefault = c_void_p()
+
+CFErrorCopyDescription = CF.CFErrorCopyDescription
+CFErrorCopyDescription.restype = c_void_p
+CFErrorCopyDescription.argtypes = [c_void_p]
+
+CFDictionaryGetValue = CF.CFDictionaryGetValue
+CFDictionaryGetValue.restype = c_void_p
+CFDictionaryGetValue.argtypes = [c_void_p, c_void_p]
+
+CFArrayGetValueAtIndex = CF.CFArrayGetValueAtIndex
+CFArrayGetValueAtIndex.restype = c_void_p
+CFArrayGetValueAtIndex.argtypes = [c_void_p, c_uint32]
+
+CFURLCreateWithFileSystemPath = CF.CFURLCreateWithFileSystemPath
+CFURLCreateWithFileSystemPath.restype = c_void_p
+CFURLCreateWithFileSystemPath.argtypes = [c_void_p, c_void_p, c_uint32, c_bool]
+
+CFBundleCopyInfoDictionaryForURL = CF.CFBundleCopyInfoDictionaryForURL
+CFBundleCopyInfoDictionaryForURL.restype = c_void_p
+CFBundleCopyInfoDictionaryForURL.argtypes = [c_void_p]
+
+CFStringGetDoubleValue = CF.CFStringGetDoubleValue
+CFStringGetDoubleValue.restype = c_double
+CFStringGetDoubleValue.argtypes = [c_void_p]
+
+SecurityPath = find_library("Security")
+Security = CDLL(SecurityPath)
+
+AuthorizationCreate = Security.AuthorizationCreate
+AuthorizationCreate.restype = c_int32
+AuthorizationCreate.argtypes = [c_void_p, c_void_p, c_int32, c_void_p]
+
+AuthorizationFree = Security.AuthorizationFree
+AuthorizationFree.restype = c_uint32
+AuthorizationFree.argtypes = [c_void_p, c_uint32]
+
+kAuthorizationFlagDefaults = 0
+kAuthorizationFlagInteractionAllowed = 1 << 0
+kAuthorizationFlagExtendRights = 1 << 1
+kAuthorizationFlagDestroyRights = 1 << 3
+kAuthorizationFlagPreAuthorize = 1 << 4
+
+kAuthorizationEmptyEnvironment = None
+
+errAuthorizationSuccess = 0
+errAuthorizationDenied = -60005
+errAuthorizationCanceled = -60006
+errAuthorizationInteractionNotAllowed = -60007
+
+ServiceManagementPath = find_library("ServiceManagement")
+ServiceManagement = CDLL(ServiceManagementPath)
+
+kSMRightBlessPrivilegedHelper = "com.apple.ServiceManagement.blesshelper"
+kSMRightModifySystemDaemons = "com.apple.ServiceManagement.daemons.modify"
+
+# pylint: disable=E1101
+# c_void_p has no "in_dll" member:
+kSMDomainSystemLaunchd = c_void_p.in_dll(ServiceManagement,
+                                         "kSMDomainSystemLaunchd")
+# pylint: enable=E1101
+
+SMJobBless = ServiceManagement.SMJobBless
+SMJobBless.restype = c_bool
+SMJobBless.argtypes = [c_void_p, c_void_p, c_void_p, POINTER(c_void_p)]
+
+SMJobRemove = ServiceManagement.SMJobRemove
+SMJobRemove.restype = c_bool
+SMJobRemove.argtypes = [c_void_p, c_void_p, c_void_p, c_bool,
+                        POINTER(c_void_p)]
+
+SMJobCopyDictionary = ServiceManagement.SMJobCopyDictionary
+SMJobCopyDictionary.restype = c_void_p
+SMJobCopyDictionary.argtypes = [c_void_p, c_void_p]
+
+
+class AuthorizationItem(Structure):
+    """AuthorizationItem Struct"""
+    _fields_ = [("name", c_char_p),
+                ("valueLength", c_uint32),
+                ("value", c_void_p),
+                ("flags", c_uint32)]
+
+
+class AuthorizationRights(Structure):
+    """AuthorizationRights Struct"""
+    _fields_ = [("count", c_uint32),
+                # * 1 here is specific to our use below
+                ("items", POINTER(AuthorizationItem))]
+
+
+class DaemonInstallException(Exception):
+    """Error securely installing daemon."""
+
+
+class AuthUserCanceledException(Exception):
+    """The user canceled the authorization."""
+
+
+class AuthFailedException(Exception):
+    """The authorization faild for some reason."""
+
+
+class DaemonRemoveException(Exception):
+    """Error removing existing daemon."""
+
+
+class DaemonVersionMismatchException(Exception):
+    """Incompatible version of the daemon found."""
+
+
+def create_cfstr(s):
+    """Creates a CFString from a python string.
+
+    Note - because this is a "create" function, you have to CFRelease
+    the returned string.
+    """
+    return CFStringCreateWithCString(kCFAllocatorDefault,
+                                     s.encode('utf8'),
+                                     kCFStringEncodingUTF8)
+
+
+def get_bundle_version(path_cfstr):
+    """Returns a float version from the plist of the given bundle.
+
+    path_cfstr must be a CFStringRef.
+    """
+    cfurl = CFURLCreateWithFileSystemPath(None,  # use default allocator
+                                          path_cfstr,
+                                          0,  # POSIX style path
+                                          False)
+    plist = CFBundleCopyInfoDictionaryForURL(cfurl)
+    ver_key_cfstr = create_cfstr("CFBundleVersion")
+    version_cfstr = CFDictionaryGetValue(plist, ver_key_cfstr)
+
+    version = CFStringGetDoubleValue(version_cfstr)
+
+    CFRelease(cfurl)
+    CFRelease(plist)
+    CFRelease(ver_key_cfstr)
+
+    return version
+
+
+def get_fsevents_daemon_installed_version():
+    """Returns helper version or None if helper is not installed."""
+
+    label_cfstr = create_cfstr(FSEVENTSD_JOB_LABEL)
+    job_data_cfdict = SMJobCopyDictionary(kSMDomainSystemLaunchd,
+                                          label_cfstr)
+    CFRelease(label_cfstr)
+
+    if job_data_cfdict is not None:
+        key_cfstr = create_cfstr("ProgramArguments")
+        args_cfarray = CFDictionaryGetValue(job_data_cfdict, key_cfstr)
+
+        path_cfstr = CFArrayGetValueAtIndex(args_cfarray, 0)
+        version = get_bundle_version(path_cfstr)
+
+        # only release things "copied" or "created", not "got".
+        CFRelease(job_data_cfdict)
+        CFRelease(key_cfstr)
+        return version
+
+    return None
+
+
+def get_authorization():
+    """Get authorization to remove and/or install daemons."""
+
+    # pylint: disable=W0201
+    authItemBless = AuthorizationItem()
+    authItemBless.name = kSMRightBlessPrivilegedHelper
+    authItemBless.valueLength = 0
+    authItemBless.value = None
+    authItemBless.flags = 0
+
+    authRights = AuthorizationRights()
+    authRights.count = 1
+    authRights.items = (AuthorizationItem * 1)(authItemBless)
+
+    flags = (kAuthorizationFlagDefaults |
+             kAuthorizationFlagInteractionAllowed |
+             kAuthorizationFlagPreAuthorize |
+             kAuthorizationFlagExtendRights)
+
+    authRef = c_void_p()
+
+    status = AuthorizationCreate(byref(authRights),
+                                 kAuthorizationEmptyEnvironment,
+                                 flags,
+                                 byref(authRef))
+
+    if status != errAuthorizationSuccess:
+
+        if status == errAuthorizationInteractionNotAllowed:
+            raise AuthFailedException("Authorization failed: "
+                                      "interaction not allowed.")
+
+        elif status == errAuthorizationDenied:
+            raise AuthFailedException("Authorization failed: auth denied.")
+
+        else:
+            raise AuthUserCanceledException()
+
+    if authRef is None:
+        raise AuthFailedException("No authRef from AuthorizationCreate: %r"
+                                  % status)
+    return authRef
+
+
+def install_fsevents_daemon(authRef):
+    """Call SMJobBless to install daemon.
+
+    No return, raises on error.
+    """
+
+    desc_cfstr = None
+
+    try:
+        error = c_void_p()
+
+        label_cfstr = create_cfstr(FSEVENTSD_JOB_LABEL)
+        ok = SMJobBless(kSMDomainSystemLaunchd,
+                        label_cfstr,
+                        authRef,
+                        byref(error))
+        CFRelease(label_cfstr)
+
+        if not ok:
+            desc_cfstr = CFErrorCopyDescription(error)
+            CFShow(desc_cfstr)
+            raise DaemonInstallException("SMJobBless error (see above)")
+
+    finally:
+        if desc_cfstr:
+            CFRelease(desc_cfstr)
+
+
+def remove_fsevents_daemon(authRef):
+    """Call SMJobRemove to remove daemon.
+
+    No return, raises on error.
+    """
+    desc_cfstr = None
+    try:
+        error = c_void_p()
+
+        label_cfstr = create_cfstr(FSEVENTSD_JOB_LABEL)
+        ok = SMJobRemove(kSMDomainSystemLaunchd,
+                         label_cfstr,
+                         authRef,
+                         True,
+                         byref(error))
+
+        CFRelease(label_cfstr)
+
+        if not ok:
+            desc_cfstr = CFErrorCopyDescription(error)
+            CFShow(desc_cfstr)
+            raise DaemonRemoveException("SMJobRemove error (see above)")
+    finally:
+        if desc_cfstr:
+            CFRelease(desc_cfstr)
+
 
 def add_to_autostart():
     """Add syncdaemon to the session's autostart."""
@@ -50,6 +357,72 @@
     return folders
 
 
+def check_and_install_fsevents_daemon(main_app_dir):
+    """Checks version of running daemon, maybe installs.
+
+    'main_app_dir' is the path to the running app.
+
+    This will securely install the daemon bundled with the running app
+    if there is no currently installed one, or upgrade it if the
+    installed one is old. If the installed one is newer, it raises
+    a DaemonVersionMismatchException.
+    """
+
+    daemon_path = os.path.join(main_app_dir, 'Contents',
+                               'Library', 'LaunchServices',
+                               FSEVENTSD_JOB_LABEL)
+    bundled_version = get_bundle_version(create_cfstr(daemon_path))
+
+    installed_version = get_fsevents_daemon_installed_version()
+
+    if installed_version == bundled_version:
+        logger.info("Current fsevents daemon already installed: version %r" %
+                    installed_version)
+        return
+
+    if installed_version > bundled_version:
+        desc = ("Found newer fsevents daemon:"
+                " installed %r > bundled version %r." %
+                (installed_version, bundled_version))
+        logger.error(desc)
+        raise DaemonVersionMismatchException(desc)
+
+    authRef = get_authorization()
+
+    if (installed_version is not None and
+        installed_version < bundled_version):
+        logger.info("Found installed daemon version %r < %r, removing." %
+                    (installed_version, bundled_version))
+
+        try:
+            remove_fsevents_daemon(authRef)
+        except DaemonRemoveException, e:
+            logger.exception("Problem removing running daemon: %r" % e)
+
+        AuthorizationFree(authRef, kAuthorizationFlagDestroyRights)
+
+    logger.info("Installing daemon version %r" % bundled_version)
+
+    try:
+        authRef = get_authorization()
+        install_fsevents_daemon(authRef)
+
+        installed_version = get_fsevents_daemon_installed_version()
+
+        if installed_version:
+            logger.info("Installed fsevents daemon successfully: version %r" %
+                        installed_version)
+        else:
+            logger.error("Error installing fsevents daemon, see system.log.")
+
+    except DaemonInstallException, e:
+        logger.exception("Exception in fsevents daemon installation: %r" % e)
+        raise e
+
+    finally:
+        AuthorizationFree(authRef, kAuthorizationFlagDestroyRights)
+
+
 def install_config_and_daemons():
     """Install required data files and fsevents daemon.
 
@@ -80,6 +453,8 @@
         if not os.path.exists(dest_path):
             shutil.copyfile(src_path, dest_path)
 
+    check_and_install_fsevents_daemon(main_app_dir)
+
 
 def perform_update():
     """Spawn the autoupdate process and call the stop function."""

=== modified file 'ubuntuone/controlpanel/utils/tests/test_darwin.py'
--- ubuntuone/controlpanel/utils/tests/test_darwin.py	2012-08-06 16:47:44 +0000
+++ ubuntuone/controlpanel/utils/tests/test_darwin.py	2012-10-02 18:05:36 +0000
@@ -19,6 +19,9 @@
 import os
 import sys
 
+from collections import defaultdict
+from functools import partial
+
 from twisted.internet import defer
 
 from ubuntuone.controlpanel import utils
@@ -28,6 +31,28 @@
 # pylint: disable=W0212
 
 
+class CallRecordingTestCase(TestCase):
+    """Base class with multi-call checker."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set up call checker."""
+        yield super(CallRecordingTestCase, self).setUp()
+        self._called = defaultdict(list)
+
+    def _patch_and_track(self, module, funcs):
+        """Record calls along with function name."""
+
+        def record_call(fname, retval, *args, **kwargs):
+            """Wrapper for a single function."""
+            self._called[fname].append((args, kwargs))
+            return retval
+
+        for (fname, retval) in funcs:
+            wrapper = partial(record_call, fname, retval)
+            self.patch(module, fname, wrapper)
+
+
 class InstallConfigTestCase(TestCase):
     """Test install_config_and_daemons."""
 
@@ -37,6 +62,10 @@
         yield super(InstallConfigTestCase, self).setUp()
         self._called = []
 
+        self.patch(utils.darwin,
+                   'check_and_install_fsevents_daemon',
+                   lambda _: None)
+
     def _set_called(self, *args, **kwargs):
         """Store 'args' and 'kwargs for test assertions."""
         self._called.append((args, kwargs))
@@ -76,3 +105,200 @@
         """When frozen, we do not copy the conf files if they do exist."""
         self._test_copying_conf_files(True)
         self.assertEqual(self._called, [])
+
+
+class InstallDaemonTestCase(CallRecordingTestCase):
+    """Test fsevents daemon installation."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set up patched & tracked calls."""
+        yield super(InstallDaemonTestCase, self).setUp()
+
+        self._patch_and_track(utils.darwin,
+                              [('get_authorization', 'Fake AuthRef'),
+                               ('remove_fsevents_daemon', None),
+                               ('install_fsevents_daemon', None),
+                               ('AuthorizationFree', None)])
+
+    def _patch_versions(self, installed, bundled):
+        """Convenience to patch the version-getting functions."""
+        self.patch(utils.darwin,
+                   "get_bundle_version",
+                   lambda _: bundled)
+        self.patch(utils.darwin,
+                   "get_fsevents_daemon_installed_version",
+                   lambda: installed)
+
+    def test_check_and_install_current_version(self):
+        """Test that we do nothing on current version"""
+
+        self._patch_versions(installed=47.0, bundled=47.0)
+
+        utils.darwin.check_and_install_fsevents_daemon('NOT A REAL DIR')
+
+        self.assertEqual(self._called.keys(), [])
+
+    def test_check_and_install_upgrade(self):
+        """Test removing old daemon and installing new one."""
+
+        self._patch_versions(installed=35.0, bundled=35.1)
+
+        utils.darwin.check_and_install_fsevents_daemon('NOT A REAL DIR')
+
+        self.assertEqual(self._called['get_authorization'],
+                         [((), {}), ((), {})])
+        self.assertEqual(self._called['remove_fsevents_daemon'],
+                         [(('Fake AuthRef',), {})])
+        self.assertEqual(self._called['install_fsevents_daemon'],
+                         [(('Fake AuthRef',), {})])
+        self.assertEqual(self._called['AuthorizationFree'],
+                         [(('Fake AuthRef',
+                            utils.darwin.kAuthorizationFlagDestroyRights), {}),
+                          (('Fake AuthRef',
+                            utils.darwin.kAuthorizationFlagDestroyRights), {})
+                          ])
+
+    def test_check_and_install_mismatch(self):
+        """Test raising when we're older than the daemon."""
+
+        self._patch_versions(installed=102.5, bundled=66.0)
+
+        self.assertRaises(utils.darwin.DaemonVersionMismatchException,
+                          utils.darwin.check_and_install_fsevents_daemon,
+                          'NOT A REAL DIR')
+        self.assertEqual(self._called.keys(), [])
+
+
+class CFCallsTestCase(CallRecordingTestCase):
+    """Test functions that call CoreFoundation API."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set up call checker."""
+        yield super(CFCallsTestCase, self).setUp()
+        self._called = defaultdict(list)
+        self.patch(utils.darwin, 'create_cfstr',
+                   lambda s: s)
+        self.patch(utils.darwin, 'CFShow',
+                   lambda _: None)
+        self.patch(utils.darwin, 'kSMDomainSystemLaunchd',
+                   'not a c_void_p')
+
+    def test_remove_daemon_ok(self):
+        """Test that we call SMJobRemove and don't raise when it returns OK."""
+        self._patch_and_track(utils.darwin, [('SMJobRemove', True),
+                                             ('c_void_p', 'notaptr'),
+                                             ('byref', 'not a **'),
+                                             ('CFRelease', 'ignore')])
+
+        utils.darwin.remove_fsevents_daemon('not an authref')
+        self.assertEqual(self._called['SMJobRemove'],
+                         [(('not a c_void_p',
+                            utils.darwin.FSEVENTSD_JOB_LABEL,
+                           'not an authref',
+                           True, 'not a **'), {})])
+        self.assertEqual(self._called['CFRelease'],
+                         [((utils.darwin.FSEVENTSD_JOB_LABEL,), {})])
+
+    def test_remove_daemon_not_ok(self):
+        """Test that we raise when SMJobRemove returns not OK."""
+        self._patch_and_track(utils.darwin, [('SMJobRemove', False),
+                                             ('c_void_p', 'notaptr'),
+                                             ('byref', 'not a **'),
+                                             ('CFRelease', 'ignore'),
+                                             ('CFErrorCopyDescription',
+                                              'Houston, we have a problem')])
+
+        self.assertRaises(utils.darwin.DaemonRemoveException,
+                          utils.darwin.remove_fsevents_daemon,
+                          'not an authref')
+
+    def test_install_daemon_ok(self):
+        """Test that we call SMJobBless and don't raise when it returns OK."""
+        self._patch_and_track(utils.darwin, [('SMJobBless', True),
+                                             ('c_void_p', 'notaptr'),
+                                             ('byref', 'not a **'),
+                                             ('CFRelease', 'ignore')])
+
+        utils.darwin.install_fsevents_daemon('not an authref')
+        self.assertEqual(self._called['SMJobBless'],
+                         [(('not a c_void_p',
+                            utils.darwin.FSEVENTSD_JOB_LABEL,
+                           'not an authref',
+                            'not a **'), {})])
+        self.assertEqual(self._called['CFRelease'],
+                         [((utils.darwin.FSEVENTSD_JOB_LABEL,), {})])
+
+    def test_install_daemon_not_ok(self):
+        """Test that we raise when SMJobBless returns not OK."""
+        self._patch_and_track(utils.darwin, [('SMJobBless', False),
+                                             ('c_void_p', 'notaptr'),
+                                             ('byref', 'not a **'),
+                                             ('CFRelease', 'ignore'),
+                                             ('CFErrorCopyDescription',
+                                              'Houston, we have a problem')])
+
+        self.assertRaises(utils.darwin.DaemonInstallException,
+                          utils.darwin.install_fsevents_daemon,
+                          'not an authref')
+
+    def test_get_bundle_version(self):
+        """Simple test of #calls in get_bundle_version."""
+        # This list includes expected counts. This test is mostly good
+        # to check that we match the number of 'create's with the
+        # number of 'releases', which is 3 (note create_cfstr is
+        # patched in setUp.)
+        to_track = [('CFURLCreateWithFileSystemPath',
+                     'url', 1),
+                    ('CFBundleCopyInfoDictionaryForURL',
+                     'dict', 1),
+                    ('CFDictionaryGetValue', 'val', 1),
+                    ('CFStringGetDoubleValue', 102.5, 1),
+                    ('CFRelease', 'ignore', 3)]
+        self._patch_and_track(utils.darwin, [(n, r) for (n, r, _) in to_track])
+
+        utils.darwin.get_bundle_version("not a cfstr")
+        for (name, _, num) in to_track:
+            self.assertEqual(len(self._called[name]), num)
+
+    def test_get_fsevents_daemon_installed_version_ok(self):
+        """Test that we return the version if the dictionary is there."""
+        to_track = [('SMJobCopyDictionary', 'not none'),
+                    ('CFRelease', 'None'),
+                    ('CFDictionaryGetValue', 'val from dict'),
+                    ('CFArrayGetValueAtIndex', 'val'),
+                    ('get_bundle_version', 1.0)]
+        self._patch_and_track(utils.darwin, to_track)
+        utils.darwin.get_fsevents_daemon_installed_version()
+
+        self.assertEqual(self._called['CFDictionaryGetValue'],
+                         [(('not none', "ProgramArguments"), {})])
+        self.assertEqual(self._called['CFArrayGetValueAtIndex'],
+                         [(('val from dict', 0), {})])
+        self.assertEqual(self._called['get_bundle_version'],
+                         [(('val',), {})])
+
+    def test_get_fsevents_daemon_installed_version_not_found(self):
+        """Test that we return None if the dictionary is not there."""
+        to_track = [('SMJobCopyDictionary', None),
+                    ('CFRelease', 'None'),
+                    ('CFDictionaryGetValue', 'val from dict'),
+                    ('CFArrayGetValueAtIndex', 'val'),
+                    ('get_bundle_version', 1.0)]
+        self._patch_and_track(utils.darwin, to_track)
+        utils.darwin.get_fsevents_daemon_installed_version()
+
+        self.assertTrue('CFDictionaryGetValue' not in self._called.keys())
+        self.assertTrue('CFArrayGetValueAtIndex' not in self._called.keys())
+        self.assertTrue('get_bundle_version' not in self._called.keys())
+
+    def test_get_authorization_ok(self):
+        """Test successful call of AuthorizationCreate does not raise."""
+        to_track = [('c_void_p', 'not void p'),
+                    ('byref', 'not **'),
+                    ('AuthorizationCreate',
+                     utils.darwin.errAuthorizationSuccess)]
+        self._patch_and_track(utils.darwin, to_track)
+        auth_ref = utils.darwin.get_authorization()
+        self.assertEqual(auth_ref, 'not void p')