Merge lp:~nataliabidart/ubuntuone-client/stable-3-0-update into lp:ubuntuone-client/stable-3-0

[Natalia Bidart]

[ Manuel de la Pena <email address hidden> ]
  - Ensure that the folders returned by listdir and walk are not system folders
    (LP: #845659).
  - Added more details in the raised exception to fix bug (LP: #817582).
  - Ensure that if the path is missing we let the client now that we did not
    manage to start the sd (LP: #881186).

[ Guillermo Gonzalez <email address hidden> ]
  - Fix creation of volumes (with content) by adding a new "volatile" variable
    to signal when the volume is being processes by local rescan
    (LP: #869920).

[ Eric Casteleijn <email address hidden> ]
  - Uploading filename is now reset on every message display (LP: #807005).

[ Diego Sarmentero <email address hidden> ]
  - Fixed imports problems in ubuntuone/platform (LP: #898292)
  - Handle encoding of the options returned by ConfigGlue (LP: #818197).
  - Implement a multiplatform expand_user (LP: #888228).
  - Failing when trying to create ubuntuone_log_dir (LP: #881940).
  - Unicode issues resolved in ubuntu one client.

[ Natalia B. Bidart <email address hidden> ]
  - Less not-useful debug messages in the log.
  - Import from non-deprecated module ubuntuone.devtools.testcases
    (LP: #898324).

All green in ubuntu, and windows (tested windows 7).

IRL tested on Ubuntu.

[Roberto Alsina (ralsina)]

Seems to work on windows, code was reviewed on trunk...

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-12-01 19:23:32 +0000
+++ configure.ac	2011-12-19 20:54:24 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
 
-AC_INIT([ubuntuone-client], [2.99])
+AC_INIT([ubuntuone-client], [2.99.0])
 AC_CONFIG_SRCDIR([config.h.in])
 
 AM_INIT_AUTOMAKE([1.10 foreign])

=== modified file 'contrib/testing/testcase.py'
--- contrib/testing/testcase.py	2011-11-08 15:29:55 +0000
+++ contrib/testing/testcase.py	2011-12-19 20:54:24 +0000
@@ -31,7 +31,7 @@
 
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase as TwistedTestCase
-from ubuntuone.devtools.testcase import skipIfOS
+from ubuntuone.devtools.testcases import skipIfOS
 from zope.interface import implements
 from zope.interface.verify import verifyObject
 

=== modified file 'run-tests.bat'
--- run-tests.bat	2011-10-06 10:16:08 +0000
+++ run-tests.bat	2011-12-19 20:54:24 +0000
@@ -53,7 +53,7 @@
 COPY windows\clientdefs.py ubuntuone\clientdefs.py
 COPY windows\logging.conf data\logging.conf
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" --reactor=twisted -c tests -p tests\platform\linux %*
+"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" --reactor=twisted -c -p tests\platform\linux %* tests
 "%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1lint"
 :: test for style if we can, if pep8 is not present, move to the end
 IF EXIST "%PYTHONEXEPATH%\Scripts\pep8.exe"

=== modified file 'tests/platform/linux/eventlog/test_zg_listener.py'
--- tests/platform/linux/eventlog/test_zg_listener.py	2011-10-25 02:24:29 +0000
+++ tests/platform/linux/eventlog/test_zg_listener.py	2011-12-19 20:54:24 +0000
@@ -32,7 +32,7 @@
 # disabled, but fake it for running tests on lucid
 try:
     import zeitgeist.mimetypes
-    assert(zeitgeist.mimetypes is not None) # make pyflakes happy
+    assert(zeitgeist.mimetypes is not None)  # make pyflakes happy
 except ImportError:
 
     class FakeMimetypes(object):
@@ -47,6 +47,7 @@
 from contrib.testing.testcase import (
         FakeMain, FakeMainTestCase, BaseTwistedTestCase)
 from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.platform import expand_user
 from ubuntuone.storageprotocol import client, delta
 from ubuntuone.storageprotocol.request import ROOT
 from ubuntuone.storageprotocol.sharersp import NotifyShareHolder
@@ -101,6 +102,7 @@
         if d:
             d.callback(event)
 
+
 def listen_for(event_q, event, callback, count=1, collect=False):
     """Setup a EQ listener for the specified event."""
     class Listener(object):
@@ -124,7 +126,7 @@
                     callback(args)
 
     listener = Listener()
-    setattr(listener, 'handle_'+event, listener._handle_event)
+    setattr(listener, 'handle_' + event, listener._handle_event)
     event_q.subscribe(listener)
     return listener
 
@@ -225,7 +227,6 @@
                           MANIFESTATION_U1_CONTACT_DATA_OBJECT)
         self.assertEqual(other_user.text, fake_username)
 
-
     @defer.inlineCallbacks
     def test_share_deleted_is_logged(self):
         """Test VolumeManager.delete_share."""
@@ -317,7 +318,6 @@
                           MANIFESTATION_U1_CONTACT_DATA_OBJECT)
         self.assertEqual(other_user.text, fake_username)
 
-
     @defer.inlineCallbacks
     def test_share_unaccepted_is_logged(self):
         """Test that an unaccepted share event is logged."""
@@ -402,7 +402,7 @@
         def create_udf(path, name, marker):
             """Fake create_udf."""
             # check that the marker is the full path to the udf
-            expanded_path = os.path.expanduser(path.encode('utf-8'))
+            expanded_path = expand_user(path.encode('utf-8'))
             udf_path = os.path.join(expanded_path, name.encode('utf-8'))
             if str(marker) != udf_path:
                 d.errback(ValueError("marker != path - "
@@ -451,7 +451,7 @@
         def create_udf(path, name, marker):
             """Fake create_udf."""
             # check that the marker is the full path to the udf
-            expanded_path = os.path.expanduser(path.encode('utf-8'))
+            expanded_path = expand_user(path.encode('utf-8'))
             udf_path = os.path.join(expanded_path, name.encode('utf-8'))
             if str(marker) != udf_path:
                 d.errback(ValueError("marker != path - "
@@ -861,7 +861,7 @@
         listen_for(self.main.event_q, 'SV_FILE_NEW', d.callback)
         listen_for(self.main.event_q, 'AQ_DOWNLOAD_FINISHED', d2.callback)
 
-        deltas = [ self.filemp3delta ]
+        deltas = [self.filemp3delta]
         kwargs = dict(volume_id=ROOT, delta_content=deltas, end_generation=11,
                       full=True, free_bytes=10)
         self.main.sync.handle_AQ_DELTA_OK(**kwargs)
@@ -872,7 +872,7 @@
         self.assertEqual(node.is_dir, False)
         self.assertEqual(node.generation, self.filemp3delta.generation)
 
-        yield d # wait for SV_FILE_NEW
+        yield d  # wait for SV_FILE_NEW
 
         dlargs = dict(
             share_id=self.filemp3delta.share_id,
@@ -880,7 +880,7 @@
             server_hash="server hash")
         self.main.event_q.push("AQ_DOWNLOAD_FINISHED", **dlargs)
 
-        yield d2 # wait for AQ_DOWNLOAD_FINISHED
+        yield d2  # wait for AQ_DOWNLOAD_FINISHED
 
         self.assertEqual(len(self.listener.zg.events), 1)
         event = self.listener.zg.events[0]
@@ -908,7 +908,7 @@
         d = defer.Deferred()
         listen_for(self.main.event_q, 'SV_DIR_NEW', d.callback)
 
-        deltas = [ self.dirdelta ]
+        deltas = [self.dirdelta]
         kwargs = dict(volume_id=ROOT, delta_content=deltas, end_generation=11,
                       full=True, free_bytes=10)
         self.main.sync.handle_AQ_DELTA_OK(**kwargs)
@@ -919,7 +919,7 @@
         self.assertEqual(node.is_dir, True)
         self.assertEqual(node.generation, self.dirdelta.generation)
 
-        yield d # wait for SV_DIR_NEW
+        yield d  # wait for SV_DIR_NEW
 
         self.assertEqual(len(self.listener.zg.events), 1)
         event = self.listener.zg.events[0]
@@ -949,7 +949,7 @@
         listen_for(self.main.event_q, 'SV_FILE_NEW', d.callback)
         listen_for(self.main.event_q, 'AQ_DOWNLOAD_FINISHED', d2.callback)
 
-        deltas = [ self.filemp3delta ]
+        deltas = [self.filemp3delta]
         kwargs = dict(volume_id=ROOT, delta_content=deltas, end_generation=11,
                       full=True, free_bytes=10)
         self.main.sync.handle_AQ_DELTA_OK(**kwargs)
@@ -960,7 +960,7 @@
         self.assertEqual(node.is_dir, False)
         self.assertEqual(node.generation, self.filemp3delta.generation)
 
-        yield d # wait for SV_FILE_NEW
+        yield d  # wait for SV_FILE_NEW
 
         # remove from the recent list
         local_file_id = (self.filemp3delta.share_id, self.filemp3delta.node_id)
@@ -972,7 +972,7 @@
             server_hash="server hash")
         self.main.event_q.push("AQ_DOWNLOAD_FINISHED", **dlargs)
 
-        yield d2 # wait for AQ_DOWNLOAD_FINISHED
+        yield d2  # wait for AQ_DOWNLOAD_FINISHED
 
         self.assertEqual(len(self.listener.zg.events), 1)
         event = self.listener.zg.events[0]

=== modified file 'tests/platform/linux/test_credentials.py'
--- tests/platform/linux/test_credentials.py	2011-09-30 18:07:35 +0000
+++ tests/platform/linux/test_credentials.py	2011-12-19 20:54:24 +0000
@@ -25,8 +25,8 @@
 import dbus.service
 
 from twisted.internet.defer import Deferred, inlineCallbacks
-from ubuntuone.devtools.testcase import DBusTestCase
 from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.devtools.testcases.dbus import DBusTestCase
 
 from ubuntuone.platform.credentials import (
     CredentialsError,

=== modified file 'tests/platform/linux/test_dbus.py'
--- tests/platform/linux/test_dbus.py	2011-10-28 15:30:54 +0000
+++ tests/platform/linux/test_dbus.py	2011-12-19 20:54:24 +0000
@@ -20,7 +20,7 @@
 import dbus
 
 from twisted.internet import defer
-from ubuntuone.devtools.testcase import DBusTestCase
+from ubuntuone.devtools.testcases.dbus import DBusTestCase
 
 from contrib.testing.testcase import (
     FakeMainTestCase,

=== modified file 'tests/platform/linux/test_session.py'
--- tests/platform/linux/test_session.py	2011-07-27 17:31:25 +0000
+++ tests/platform/linux/test_session.py	2011-12-19 20:54:24 +0000
@@ -22,8 +22,8 @@
 
 from dbus.mainloop.glib import DBusGMainLoop
 from twisted.internet.defer import inlineCallbacks
+from ubuntuone.devtools.testcases.dbus import DBusTestCase
 
-from ubuntuone.devtools.testcase import DBusTestCase
 from ubuntuone.platform.linux import session
 
 INHIBIT_ALL = (session.INHIBIT_LOGGING_OUT |

=== modified file 'tests/platform/linux/test_vm.py'
--- tests/platform/linux/test_vm.py	2011-10-27 13:47:09 +0000
+++ tests/platform/linux/test_vm.py	2011-12-19 20:54:24 +0000
@@ -21,7 +21,7 @@
 
 from twisted.internet import defer
 
-from contrib.testing.testcase import FakeMain, environ
+from contrib.testing.testcase import FakeMain
 from tests.syncdaemon.test_vm import MetadataTestCase, BaseVolumeManagerTests
 from ubuntuone.storageprotocol import request
 from ubuntuone.syncdaemon.volume_manager import (
@@ -39,12 +39,12 @@
     def test_get_udf_path(self):
         """Test for get_udf_path."""
         suggested_path = u"suggested_path"
-        with environ('HOME', self.home_dir):
-            udf_path = get_udf_path(u"~/" + suggested_path)
+        udf_path = get_udf_path(u"~/" + suggested_path)
         self.assertEquals(os.path.join(self.home_dir,
                                        suggested_path.encode('utf-8')),
                           udf_path)
 
+
 class MetadataOldLayoutTests(MetadataTestCase):
     """Tests for 'old' layouts and metadata upgrade"""
 
@@ -87,7 +87,7 @@
         old_shelf[request.ROOT] = root_share
         for idx in range(1, 10):
             sid = str(uuid.uuid4())
-            old_shelf[sid] =  _Share(
+            old_shelf[sid] = _Share(
                 path=os.path.join(self.shares_dir, str(idx)), share_id=sid)
         # ShareFileShelf.keys returns a generator
         old_keys = [key for key in old_shelf.keys()]
@@ -151,7 +151,7 @@
         self.main = FakeMain(self.new_root_dir, self.new_shares_dir,
                              self.data_dir, self.partials_dir)
         new_keys = [new_key for new_key in self.main.vm.shares.keys()]
-        self.assertEquals(2, len(new_keys)) # the fake share plus root
+        self.assertEquals(2, len(new_keys))  # the fake share plus root
         for key in [request.ROOT, share.id]:
             self.assertIn(key, new_keys)
         self.check_version()
@@ -188,7 +188,7 @@
         expected = []
 
         for dirname, new_dirname in [(self.root_dir, self.new_root_dir),
-                                          (self.shares_dir, self.new_shares_dir)]:
+                                     (self.shares_dir, self.new_shares_dir)]:
             # a plain .conflict...
             # ...on a file
             open(dirname + '/1a.conflict', 'w').close()
@@ -558,7 +558,7 @@
             share = _Share(path=os.path.join(self.shares_dir, share_name),
                            share_id=sid, name=share_name,
                            node_id=str(uuid.uuid4()),
-                           other_username='username'+str(idx),
+                           other_username='username' + str(idx),
                            other_visible_name='visible name ' + str(idx))
             if idx % 2:
                 share.access_level = ACCESS_LEVEL_RW
@@ -592,6 +592,7 @@
         self.main = FakeMain(self.root_dir, self.shares_dir,
                              self.data_dir, self.partials_dir)
         vm = self.main.vm
+
         def compare_share(share, old_share):
             """Compare two shares, new and old"""
             self.assertEquals(share.volume_id, old_share.id)
@@ -635,7 +636,7 @@
             share = _Share(path=os.path.join(self.shares_dir, share_name),
                            share_id=sid, name=share_name,
                            node_id=str(uuid.uuid4()),
-                           other_username='username'+str(idx),
+                           other_username='username' + str(idx),
                            other_visible_name='visible name ' + str(idx))
             if idx % 2:
                 share.access_level = ACCESS_LEVEL_RW
@@ -684,6 +685,7 @@
         self.main = FakeMain(self.root_dir, self.shares_dir,
                              self.data_dir, self.partials_dir)
         vm = self.main.vm
+
         def compare_share(share, old_share):
             """Compare two shares, new and old"""
             self.assertEquals(share.volume_id, old_share.id)
@@ -730,7 +732,8 @@
         # create some old shares and shared metadata
         legacy_shares = LegacyShareFileShelf(self.share_md_dir)
         root_share = _Share(path=self.root_dir, share_id=request.ROOT,
-                            access_level=ACCESS_LEVEL_RW, node_id=str(uuid.uuid4()))
+                            access_level=ACCESS_LEVEL_RW, node_id=str(
+                                uuid.uuid4()))
         legacy_shares[request.ROOT] = root_share
         for idx, name in enumerate(['share'] * 3):
             sid = str(uuid.uuid4())
@@ -738,7 +741,7 @@
             share = _Share(path=os.path.join(self.shares_dir, share_name),
                            share_id=sid, name=share_name,
                            node_id=str(uuid.uuid4()),
-                           other_username='username'+str(idx),
+                           other_username='username' + str(idx),
                            other_visible_name='visible name ' + str(idx))
             if idx == 0:
                 share.access_level = ACCESS_LEVEL_RW
@@ -794,6 +797,7 @@
         self.main = FakeMain(self.root_dir, self.shares_dir,
                              self.data_dir, self.partials_dir)
         vm = self.main.vm
+
         def compare_share(share, old_share):
             """Compare two shares, new and old"""
             old_id = getattr(old_share, 'id', None)
@@ -845,7 +849,7 @@
             share = _Share(path=os.path.join(self.shares_dir, share_name),
                            share_id=sid, name=share_name,
                            node_id=str(uuid.uuid4()),
-                           other_username='username'+str(idx),
+                           other_username='username' + str(idx),
                            other_visible_name='visible name ' + str(idx))
             if idx % 2:
                 share.access_level = ACCESS_LEVEL_RW
@@ -876,6 +880,7 @@
             self.set_md_version('')
         # upgrade it!
         old_upgrade_share_to_volume = MetadataUpgrader._upgrade_share_to_volume
+
         def upgrade_share_to_volume(share, shared=False):
             raise ValueError('FAIL!')
         MetadataUpgrader._upgrade_share_to_volume = upgrade_share_to_volume
@@ -928,7 +933,7 @@
             share = Share(path=os.path.join(self.shares_dir, share_name),
                            volume_id=sid, name=share_name,
                            node_id=str(uuid.uuid4()),
-                           other_username='username'+str(idx),
+                           other_username='username' + str(idx),
                            other_visible_name='visible name ' + str(idx))
             if idx % 2:
                 share.access_level = ACCESS_LEVEL_RW
@@ -1005,4 +1010,3 @@
 class BrokenNewMDVersionUpgradeTests(MetadataNewLayoutTests):
     """MetadataNewLayoutTests with broken .version file."""
     md_version_None = True
-

=== modified file 'tests/platform/test_os_helper.py'
--- tests/platform/test_os_helper.py	2011-08-25 18:49:35 +0000
+++ tests/platform/test_os_helper.py	2011-12-19 20:54:24 +0000
@@ -1,6 +1,4 @@
-#
-# Author: Guillermo Gonzalez <[e-mail]>
-#         Manuel de la Pena <[e-mail]>
+# -*- encoding: utf-8 -*-
 #
 # Copyright 2010-2011 Canonical Ltd.
 #
@@ -30,10 +28,12 @@
     BaseTwistedTestCase,
     skip_if_win32_and_uses_readonly,
 )
+from ubuntuone import platform
 from ubuntuone.platform import (
     access,
     allow_writes,
     can_write,
+    expand_user,
     is_link,
     listdir,
     make_dir,
@@ -91,6 +91,8 @@
         yield super(OSWrapperTests, self).setUp(
             test_dir_name=test_dir_name, test_file_name=test_file_name,
             valid_file_path_builder=valid_file_path_builder)
+        self.my_home = 'myhome'
+        self.patch(platform, "xdg_home", self.my_home)
         # make sure the file exists
         open_file(self.testfile, 'w').close()
 
@@ -344,6 +346,55 @@
         e = self.assertRaises(OSError, move_to_trash, path)
         self.assertEqual(e.errno, errno.ENOENT)
 
+    def test_expand_user_not_start_with_tilde(self):
+        """Test the expand_user function with an ordinary path."""
+        path = 'userpath'
+        result = expand_user(path)
+        self.assertEqual(path, result)
+
+    def test_expand_user_start_with_tilde_no_backslash(self):
+        """Test the expand_user function with tilde an ordinary path."""
+        path = '~userpath'
+        result = expand_user(path)
+        self.assertEqual(path, result)
+
+    def test_expand_user_double_backslash(self):
+        """Test the expand_user function with double backslash."""
+        path = '~~userpath'
+        result = expand_user(path)
+        self.assertEqual(path, result)
+
+    def test_expand_user_start_with_tilde(self):
+        """Test the expand_user function with a path like: ~/userpath."""
+        path = os.path.join('~', 'userpath')
+        result = expand_user(path)
+        expected = os.path.join(self.my_home, 'userpath')
+        self.assertEqual(expected, result)
+
+    def test_expand_user_tilde_and_backslash(self):
+        """Test the expand_user function with tilde and backslash."""
+        tilde = '~' + os.path.sep
+        result = expand_user(tilde)
+        expected = self.my_home + os.path.sep
+        self.assertEqual(expected, result)
+
+    def test_expand_user_only_tilde(self):
+        """Test the expand_user function returns with only tilde input."""
+        tilde = '~'
+        result = expand_user(tilde)
+        self.assertEqual(self.my_home, result)
+        self.assertFalse(result.endswith(os.path.sep))
+
+    def test_expand_user_fails_if_not_bytes(self):
+        """Test the expand_user function input assertions."""
+        path = u'userpath'
+        self.assertRaises(AssertionError, expand_user, path)
+
+    def test_expand_user_fails_if_not_utf8_encoded(self):
+        """Test the expand_user function input encoding."""
+        path = u'usérpath'.encode('latin-1')
+        self.assertRaises(AssertionError, expand_user, path)
+
 
 class RecursiveMoveTests(BaseTestCase):
     """Tests for os wrapper functions."""

=== modified file 'tests/platform/test_tools.py'
--- tests/platform/test_tools.py	2011-11-12 17:09:09 +0000
+++ tests/platform/test_tools.py	2011-12-19 20:54:24 +0000
@@ -31,6 +31,7 @@
     states,
     volume_manager,
 )
+from ubuntuone import platform
 from ubuntuone.platform import tools
 from tests.platform import IPCTestCase
 
@@ -532,6 +533,7 @@
     @defer.inlineCallbacks
     def test_create_folder(self):
         """Test for Folders.create."""
+        self.patch(platform, 'xdg_home', self.home_dir)
         path = os.path.join(self.home_dir, u'ñoño')
         volume_id = 'volume_id'
         node_id = 'node_id'
@@ -550,6 +552,7 @@
     @defer.inlineCallbacks
     def test_create_folder_error(self):
         """Test for Folders.create with error."""
+        self.patch(platform, 'xdg_home', self.home_dir)
         path = os.path.join(self.home_dir, u'ñoño')
 
         def create_udf(path, name, marker):

=== modified file 'tests/platform/windows/test_os_helper.py'
--- tests/platform/windows/test_os_helper.py	2011-09-02 11:34:17 +0000
+++ tests/platform/windows/test_os_helper.py	2011-12-19 20:54:24 +0000
@@ -1,5 +1,4 @@
-#
-# Author: Manuel de la Pena <[e-mail]>
+# -*- encoding: utf-8 -*-
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -17,7 +16,10 @@
 
 """Specific tests for the os_helper on Windows."""
 
+import errno
 import os
+import shutil
+import sys
 
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
@@ -29,7 +31,14 @@
     FILE_GENERIC_READ,
     FILE_GENERIC_WRITE,
 )
+from win32file import (
+    FILE_ATTRIBUTE_NORMAL,
+    FILE_ATTRIBUTE_SYSTEM,
+    GetFileAttributesW,
+    SetFileAttributesW
+)
 
+from ubuntuone.platform.windows import os_helper
 from ubuntuone.platform.windows.os_helper import (
     _set_file_attributes,
     _unicode_to_bytes,
@@ -40,6 +49,7 @@
     assert_windows_path,
     can_write,
     get_syncdaemon_valid_path,
+    get_user_sid,
     get_windows_valid_path,
     normpath,
     set_dir_readwrite,
@@ -50,6 +60,12 @@
 from tests.platform.test_os_helper import OSWrapperTests, WalkTests
 
 
+# ugly trick to stop pylint for complaining about
+# WindowsError on Linux
+if sys.platform != 'win32':
+    WindowsError = Exception
+
+
 def _build_invalid_windows_bytes_name():
     invalid_unicodes = u''.join(WINDOWS_ILLEGAL_CHARS_MAP)
     invalid_filename = 'test_file' + invalid_unicodes.encode('utf8')
@@ -111,6 +127,16 @@
             self.assertFalse(LONG_PATH_PREFIX in current_path)
 
 
+class FakeSecurityInfo(object):
+
+    user_sid = 'user_sid'
+
+    # pylint: disable=C0103
+    def GetSecurityDescriptorOwner(self):
+        return self.user_sid
+    # pylint: enable=C0103
+
+
 class TestAccess(BaseTwistedTestCase):
     """Test specific windows implementation access details."""
 
@@ -257,6 +283,23 @@
         _set_file_attributes(self.valid_path, groups)
         self.assertTrue(can_write(self.testfile))
 
+    def fake_security_info(self, *args):
+        return FakeSecurityInfo()
+
+    def test_get_user_sid(self):
+        self.patch(os_helper, "GetSecurityInfo", self.fake_security_info)
+        user_sid = get_user_sid()
+        self.assertEqual(user_sid, FakeSecurityInfo.user_sid)
+
+    def test_set_file_attributes_missing_path(self):
+        """Set file attr for a missing file."""
+        groups = [(EVERYONE_SID, FILE_ALL_ACCESS)]
+        # file does not exist.
+        self.patch(os_helper.os.path, 'exists', lambda f: False)
+        exc = self.assertRaises(WindowsError, _set_file_attributes,
+                                self.valid_path, groups)
+        self.assertEqual(errno.ENOENT, exc.errno,
+                        'Errno should be file not found.')
 
 class DecoratorsTestCase(TestCase):
     """Test case for all the validators and transformers."""
@@ -346,3 +389,80 @@
             name_transformer=_unicode_to_bytes)
         super(TestIllegalPathsWalk, self).test_top_down(topdown=topdown,
                                                         expected=expected)
+
+
+class TestSystemPaths(TestCase):
+    """Tests related with the system paths."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set tests."""
+        yield super(TestSystemPaths, self).setUp()
+        self.system_paths = ['My Music', 'My Pictures']
+        self.dirs = ['One', 'Two', 'Tree']
+        self.files = ['File', 'Second File', 'Last file']
+        self.temp = self.mktemp()
+        self._make_test_files()
+        self.addCleanup(shutil.rmtree, self.temp)
+
+    def _make_test_files(self):
+        """Create the temp test files."""
+
+        # lets make the files for the tests
+        for d in self.dirs:
+            os.makedirs(os.path.join(self.temp, d))
+
+        for s in self.system_paths:
+            path = os.path.join(self.temp, s)
+            os.makedirs(path)
+            self._set_as_system_path(path)
+
+        for f in self.files:
+            path = os.path.join(self.temp, f)
+            with open(path, 'w') as fd:
+                fd.write('Im a test, blame TestSystemPaths!')
+
+    def _set_as_system_path(self, path):
+        """Set a path to have the system attr."""
+        attrs = GetFileAttributesW(path)
+        attrs = attrs | FILE_ATTRIBUTE_SYSTEM
+        SetFileAttributesW(path, attrs)
+
+
+    def test_os_listdir(self):
+        """Test the list dir."""
+        expected_result = self.dirs + self.files
+        self.assertEqual(sorted(expected_result),
+                sorted(os_helper.listdir(self.temp)))
+
+    def test_os_walk(self):
+        """Test the walk."""
+        expected_dirs = ['One', 'Two', 'Tree']
+        expected_files = ['File', 'Second File', 'Last file']
+        result_dirs = []
+        result_files = []
+        for dirpath, dirs, files in os_helper.walk(self.temp):
+            result_dirs.extend(dirs)
+            result_files.extend(files)
+        self.assertEqual(sorted(expected_dirs), sorted(result_dirs))
+        self.assertEqual(sorted(expected_files), sorted(result_files))
+
+    def test_native_is_system_path_true(self):
+        """Test the function that returns if is a sytem folder."""
+
+        def fake_get_attrs(path):
+            """Fake the GetFileAttributes method."""
+            return FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_SYSTEM
+
+        self.patch(os_helper, 'GetFileAttributesW', fake_get_attrs)
+        self.assertTrue(os_helper.native_is_system_path(self.temp))
+
+    def test_native_is_system_path_false(self):
+        """Test the function that returns if is a sytem folder."""
+
+        def fake_get_attrs(path):
+            """Fake the GetFileAttributes method."""
+            return FILE_ATTRIBUTE_NORMAL
+
+        self.patch(os_helper, 'GetFileAttributesW', fake_get_attrs)
+        self.assertFalse(os_helper.native_is_system_path(self.temp))

=== modified file 'tests/platform/windows/test_tools.py'
--- tests/platform/windows/test_tools.py	2011-10-28 19:17:47 +0000
+++ tests/platform/windows/test_tools.py	2011-12-19 20:54:24 +0000
@@ -14,14 +14,18 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import sys
 
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.platform.tools.windows import (
-    SyncDaemonToolProxy,
-    UbuntuOneClient,
-)
+from ubuntuone.platform.tools import windows
+
+
+# ugly trick to stop pylint for complaining about
+# WindowsError on Linux
+if sys.platform != 'win32':
+    WindowsError = None
 
 
 class TestSyncDaemonTool(TestCase):
@@ -30,8 +34,8 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(TestSyncDaemonTool, self).setUp()
-        self.patch(UbuntuOneClient, "connect", lambda _: defer.Deferred())
-        self.sdtool = SyncDaemonToolProxy()
+        self.patch(windows.UbuntuOneClient, "connect", lambda _: defer.Deferred())
+        self.sdtool = windows.SyncDaemonToolProxy()
 
     def test_call_after_connection(self):
         """Test the _call_after_connection method."""
@@ -79,3 +83,14 @@
                 attr = getattr(self.sdtool, attr_name)
                 func_name = getattr(attr, "__name__", None)
                 self.assertNotEqual(func_name, "call_after_connection_inner")
+
+    def test_start_missing_exe(self):
+        """Test starting the service when the exe is missing."""
+        # file is missing
+        self.patch(windows.os.path, 'exists', lambda f: False)
+        key = 'key'
+        path = 'path/to/exe'
+        self.patch(windows, 'OpenKey', lambda k,p: key)
+        self.patch(windows, 'QueryValueEx', lambda k,p: path)
+
+        self.assertFailure(self.sdtool.start(), WindowsError)

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2011-10-27 13:47:09 +0000
+++ tests/status/test_aggregator.py	2011-12-19 20:54:24 +0000
@@ -1327,6 +1327,26 @@
         result = self.aggregator.get_discovery_message()
         self.assertEqual(expected, result)
 
+    def test_get_discovery_message_clears_filenames(self):
+        """Test the message that's shown on the discovery bubble."""
+        uploading = 10
+        downloading = 8
+        filename = 'upfile0.ext'
+        filename2 = 'downfile0.ext'
+        self.aggregator.files_uploading.extend([
+            FakeCommand(path='upfile%d.ext' % n) for n in range(uploading)])
+        self.aggregator.uploading_filename = filename
+        self.aggregator.files_downloading.extend([
+            FakeCommand(path='downfile%d.ext' % n) for n in
+            range(downloading)])
+        self.aggregator.downloading_filename = 'STALE FILENAME'
+        self.aggregator.uploading_filename = 'STALE FILENAME'
+        expected = (
+            aggregator.files_being_uploaded(filename, uploading) + "\n" +
+            aggregator.files_being_downloaded(filename2, downloading))
+        result = self.aggregator.get_discovery_message()
+        self.assertEqual(expected, result)
+
     def test_get_final_status_message(self):
         """The final status message."""
         done = (5, 10)

=== modified file 'tests/syncdaemon/test_config.py'
--- tests/syncdaemon/test_config.py	2011-10-03 13:36:31 +0000
+++ tests/syncdaemon/test_config.py	2011-12-19 20:54:24 +0000
@@ -20,24 +20,20 @@
 
 import logging
 import os
-import sys
 
 from ConfigParser import ConfigParser
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
-
-from ubuntuone.devtools.testcase import skipIfOS
-from ubuntuone.platform import open_file, path_exists
 from ubuntu_sso.xdg_base_directory import (
     xdg_data_home,
     xdg_cache_home,
 )
+from ubuntuone.devtools.testcases import skipIfOS
+
+from contrib.testing.testcase import BaseTwistedTestCase
+from ubuntuone import platform
+from ubuntuone.platform import open_file, path_exists
 from ubuntuone.syncdaemon import config
-from contrib.testing.testcase import (
-    BaseTwistedTestCase,
-    environ,
-)
-
 
 
 class TestConfigBasic(BaseTwistedTestCase):
@@ -205,7 +201,6 @@
         self.assertEquals(None, conf.get_throttling_read_limit())
         self.assertEquals(None, conf.get_throttling_write_limit())
 
-
     def test_load_partial_config(self):
         """test loading a partial config file and fallback to defaults"""
         conf_file = os.path.join(self.test_root, 'test_load_config.conf')
@@ -483,14 +478,13 @@
         """Check that get_config_files uses paths in the right encoding."""
         temp = self.mktemp()
         fake_path = os.path.join(temp, u"Ñandú")
-        native_dir = fake_path.encode(sys.getfilesystemencoding())
-        os.makedirs(native_dir)
-        with open(os.path.join(native_dir, config.CONFIG_FILE), "w") as f:
+        os.makedirs(fake_path)
+        with open(os.path.join(fake_path, config.CONFIG_FILE), "w") as f:
             f.write("this is a fake config file")
         fake_load_config_paths = lambda _: [fake_path.encode("utf8")]
         self.patch(config, "load_config_paths", fake_load_config_paths)
         config_files = config.get_config_files()
-        branch_config = os.path.join(native_dir, config.CONFIG_FILE)
+        branch_config = os.path.join(fake_path, config.CONFIG_FILE)
         self.assertIn(branch_config, config_files)
 
 
@@ -537,12 +531,12 @@
     def test_good_value(self):
         """Test the parser using a good value."""
         homedir = os.path.join('', 'home', 'fake')
-        with environ('HOME', homedir):
-            expected = os.path.join(self.xdg_dir, 'hola', 'mundo')
-            actual = self.parser(self.good_value)
-            self.assertEqual(expected, actual)
-            self.assertIsInstance(actual, str)
-            self.assertNotIsInstance(actual, unicode)
+        self.patch(platform, 'xdg_home', homedir)
+        expected = os.path.join(self.xdg_dir, 'hola', 'mundo')
+        actual = self.parser(self.good_value)
+        self.assertEqual(expected, actual)
+        self.assertIsInstance(actual, str)
+        self.assertNotIsInstance(actual, unicode)
 
     def test_bad_value(self):
         """Test the parser using a bad value."""

=== modified file 'tests/syncdaemon/test_eq_inotify.py'
--- tests/syncdaemon/test_eq_inotify.py	2011-09-02 17:29:30 +0000
+++ tests/syncdaemon/test_eq_inotify.py	2011-12-19 20:54:24 +0000
@@ -24,8 +24,8 @@
 import os
 
 from twisted.internet import defer, reactor
-from ubuntuone.devtools.testcase import skipIfOS
 from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.devtools.testcases import skipIfOS
 
 from contrib.testing.testcase import (
     BaseTwistedTestCase,
@@ -34,6 +34,7 @@
     skip_if_win32_missing_fs_event,
 )
 from tests.syncdaemon.test_eventqueue import BaseEQTestCase
+from ubuntuone import platform
 from ubuntuone.platform import (
     make_link,
     make_dir,
@@ -660,10 +661,7 @@
         self.eq.subscribe(self.listener)
         self.addCleanup(self.eq.unsubscribe, self.listener)
 
-        env_var = 'HOME'
-        old_value = os.environ.get(env_var, None)
-        os.environ[env_var] = self.home_dir
-        self.addCleanup(os.environ.__setitem__, env_var, old_value)
+        self.patch(platform, 'xdg_home', self.home_dir)
 
         # create UDF
         suggested_path = u'~/Documents/Reading/Books/PDFs'

=== modified file 'tests/syncdaemon/test_fileshelf.py'
--- tests/syncdaemon/test_fileshelf.py	2011-08-10 18:27:24 +0000
+++ tests/syncdaemon/test_fileshelf.py	2011-12-19 20:54:24 +0000
@@ -24,8 +24,9 @@
 import unittest
 
 from twisted.internet import defer
+from ubuntuone.devtools.testcases import skipIfOS
 
-from ubuntuone.devtools.testcase import skipIfOS
+from contrib.testing.testcase import BaseTwistedTestCase
 from ubuntuone.platform import (
     open_file,
     path_exists,
@@ -36,7 +37,6 @@
     LRUCache,
     CacheInconsistencyError,
 )
-from contrib.testing.testcase import BaseTwistedTestCase
 
 
 BROKEN_PICKLE = '\axb80\x02}q\x01(U\x01aU\x04testq\x02U\x01bU\x06brokenq\x03u.'

=== modified file 'tests/syncdaemon/test_interaction_interfaces.py'
--- tests/syncdaemon/test_interaction_interfaces.py	2011-11-02 16:51:32 +0000
+++ tests/syncdaemon/test_interaction_interfaces.py	2011-12-19 20:54:24 +0000
@@ -1559,6 +1559,7 @@
         info = yield d
 
         udf.subscribed = True
+        udf.local_rescanning = False
         self.assertEqual(get_udf_dict(udf), info)
 
     @defer.inlineCallbacks
@@ -1589,6 +1590,7 @@
         info = yield d
 
         udf.subscribed = False
+        udf.local_rescanning = False
         self.assertEqual(get_udf_dict(udf), info)
 
     @defer.inlineCallbacks
@@ -1648,6 +1650,7 @@
         info = yield d
 
         share.subscribed = True
+        share.local_rescanning = False
         self.assertEqual(get_share_dict(share), info)
 
     @defer.inlineCallbacks
@@ -1678,6 +1681,7 @@
         info = yield d
 
         share.subscribed = False
+        share.local_rescanning = False
         self.assertEqual(get_share_dict(share), info)
 
     @defer.inlineCallbacks

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2011-11-02 16:51:32 +0000
+++ tests/syncdaemon/test_localrescan.py	2011-12-19 20:54:24 +0000
@@ -26,13 +26,14 @@
 
 from twisted.internet import defer, reactor
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.devtools.testcase import skipIfOS
+from ubuntuone.devtools.testcases import skipIfOS
 
 from contrib.testing.testcase import (
     BaseTwistedTestCase,
     FakeVolumeManager,
     skip_if_win32_and_uses_readonly,
 )
+from ubuntuone import platform
 from ubuntuone.platform import (
     make_dir,
     make_link,
@@ -130,9 +131,7 @@
         self.tritcask_dir = self.mktemp("tritcask")
 
         # set the home for the tests
-        old_value = os.environ.get('HOME', None)
-        os.environ['HOME'] = self.home_dir
-        self.addCleanup(os.environ.__setitem__, 'HOME', old_value)
+        self.patch(platform, 'xdg_home', self.home_dir)
 
         self.vm = FakeVolumeManager(usrdir)
         self.db = Tritcask(self.tritcask_dir)
@@ -372,9 +371,7 @@
         """Init."""
         yield super(VolumeTestCase, self).setUp()
 
-        old_value = os.environ.get('HOME', None)
-        os.environ['HOME'] = self.home_dir
-        self.addCleanup(os.environ.__setitem__, 'HOME', old_value)
+        self.patch(platform, 'xdg_home', self.home_dir)
 
         self.lr = local_rescan.LocalRescan(self.vm, self.fsm, self.eq, self.aq)
 
@@ -2021,9 +2018,7 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(RootBadStateTests, self).setUp()
-        old_value = os.environ.get('HOME', None)
-        os.environ['HOME'] = self.home_dir
-        self.addCleanup(os.environ.__setitem__, 'HOME', old_value)
+        self.patch(platform, 'xdg_home', self.home_dir)
 
     @defer.inlineCallbacks
     def _test_it(self, volume):
@@ -2262,9 +2257,7 @@
 
         self.lr = local_rescan.LocalRescan(self.vm, self.fsm, self.eq, self.aq)
 
-        old_value = os.environ.get('HOME', None)
-        os.environ['HOME'] = self.home_dir
-        self.addCleanup(os.environ.__setitem__, 'HOME', old_value)
+        self.patch(platform, 'xdg_home', self.home_dir)
 
         # create UDF
         suggested_path = u'~/Documents/Reading/Books/PDFs'

=== modified file 'tests/syncdaemon/test_logger.py'
--- tests/syncdaemon/test_logger.py	2011-10-27 11:39:43 +0000
+++ tests/syncdaemon/test_logger.py	2011-12-19 20:54:24 +0000
@@ -24,7 +24,7 @@
 from twisted.trial import unittest
 
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.devtools.testcase import skipIfOS
+from ubuntuone.devtools.testcases import skipIfOS
 
 from ubuntuone.syncdaemon.logger import (
     DebugCapture,

=== modified file 'tests/syncdaemon/test_main.py'
--- tests/syncdaemon/test_main.py	2011-10-21 13:40:09 +0000
+++ tests/syncdaemon/test_main.py	2011-12-19 20:54:24 +0000
@@ -20,6 +20,7 @@
 
 from twisted.internet import defer, reactor
 from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.platform import expand_user
 
 from contrib.testing.testcase import (
     BaseTwistedTestCase, FAKED_CREDENTIALS,
@@ -263,13 +264,13 @@
 
     def test_get_rootdir(self):
         """The get_rootdir returns the root dir."""
-        expected = os.path.expanduser(os.path.join('~', 'Ubuntu Test One'))
+        expected = expand_user(os.path.join('~', 'Ubuntu Test One'))
         main = self.build_main(root_dir=expected)
         self.assertEqual(main.get_rootdir(), expected)
 
     def test_get_sharesdir(self):
         """The get_sharesdir returns the shares dir."""
-        expected = os.path.expanduser(os.path.join('~', 'Share it to Me'))
+        expected = expand_user(os.path.join('~', 'Share it to Me'))
         main = self.build_main(shares_dir=expected)
         self.assertEqual(main.get_sharesdir(), expected)
 

=== modified file 'tests/syncdaemon/test_sync.py'
--- tests/syncdaemon/test_sync.py	2011-09-02 12:22:35 +0000
+++ tests/syncdaemon/test_sync.py	2011-12-19 20:54:24 +0000
@@ -30,7 +30,7 @@
 
 from twisted.internet import defer
 from twisted.python.failure import Failure
-from ubuntuone.devtools.testcase import skipIfOS
+from ubuntuone.devtools.testcases import skipIfOS
 
 from contrib.testing.testcase import (
     FakeMain,

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2011-10-25 02:24:29 +0000
+++ tests/syncdaemon/test_vm.py	2011-12-19 20:54:24 +0000
@@ -30,19 +30,20 @@
 
 from mocker import Mocker, MATCH
 from twisted.internet import defer, reactor
-
-from contrib.testing.testcase import (
-    BaseTwistedTestCase,
-    FakeMain,
-)
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.devtools.testcase import skipIfOS
+from ubuntuone.devtools.testcases import skipIfOS
 from ubuntuone.storageprotocol import volumes, request
 from ubuntuone.storageprotocol.client import ListShares
 from ubuntuone.storageprotocol.sharersp import (
     NotifyShareHolder,
     ShareResponse,
 )
+
+from contrib.testing.testcase import (
+    BaseTwistedTestCase,
+    FakeMain,
+)
+from ubuntuone import platform
 from ubuntuone.syncdaemon import config, event_queue, tritcask
 from ubuntuone.syncdaemon.volume_manager import (
     ACCESS_LEVEL_RO,
@@ -97,15 +98,18 @@
         self.partials_dir = self.mktemp('partials_dir')
         self.main = FakeMain(self.root_dir, self.shares_dir,
                              self.data_dir, self.partials_dir)
+        self.patch(platform, 'xdg_home', self.home_dir)
 
         self.watches = set()  # keep track of added watches
 
         orig_add_watch = self.main.event_q.add_watch
+
         def fake_add_watch(path):
             self.watches.add(path)
             return orig_add_watch(path)
 
         orig_rm_watch = self.main.event_q.rm_watch
+
         def fake_rm_watch(path):
             self.watches.remove(path)
             return orig_rm_watch(path)
@@ -135,6 +139,7 @@
     def _listen_for(self, event, callback, count=1, collect=False):
         """Setup a EQ listener for the especified event."""
         event_q = self.main.event_q
+
         class Listener(object):
             """A basic listener to handle the pushed event."""
 
@@ -407,7 +412,8 @@
     @defer.inlineCallbacks
     def test_add_share_modify_scans_share(self):
         """Test that add_share scans the share."""
-        share = self._create_share(access_level=ACCESS_LEVEL_RW, subscribed=True)
+        share = self._create_share(access_level=ACCESS_LEVEL_RW,
+            subscribed=True)
 
         scan_d = defer.Deferred()
 
@@ -426,6 +432,7 @@
         self.patch(self.main.lr, 'scan_dir', fake_scan_dir)
 
         scratch_d = defer.Deferred()
+
         def fake_rescan_from_scratch(volume_id):
             """A fake scan share that check the arguments."""
             self.assertEqual(share.volume_id, volume_id)
@@ -483,7 +490,7 @@
             # add a inotify watch to the dir
             yield self.vm._add_watch(path)
         files = ['a_file', os.path.join('dir', 'file'),
-                 os.path.join('dir','subdir','file')]
+                 os.path.join('dir', 'subdir', 'file')]
         for i, file in enumerate(files):
             path = os.path.join(share.path, file)
             self.main.fs.create(path, share.volume_id)
@@ -558,7 +565,7 @@
         response = ListShares(None)
         response.shares = [share_response]
         self.vm.handle_AQ_SHARES_LIST(response)
-        self.assertEqual(2, len(self.vm.shares)) # the new shares and root
+        self.assertEqual(2, len(self.vm.shares))  # the new shares and root
         # check that the share is in the shares dict
         self.assertIn(str(share_id), self.vm.shares)
         share = self.vm.shares[str(share_id)]
@@ -582,7 +589,8 @@
                       access_level=ACCESS_LEVEL_RO)
         yield self.vm.add_share(share)
         self.vm.handle_SV_SHARE_CHANGED(info=share_holder)
-        self.assertEquals(ACCESS_LEVEL_RW, self.vm.shares[str(share_id)].access_level)
+        self.assertEquals(ACCESS_LEVEL_RW,
+            self.vm.shares[str(share_id)].access_level)
         self.vm.handle_SV_SHARE_DELETED(share_holder.share_id)
         self.assertNotIn('share_id', self.vm.shares)
 
@@ -619,8 +627,8 @@
         response = ListShares(None)
         response.shares = [share_response, shared_response]
         self.vm.handle_AQ_SHARES_LIST(response)
-        self.assertEqual(2, len(self.vm.shares)) # the new share and root
-        self.assertEqual(1, len(self.vm.shared)) # the new shared
+        self.assertEqual(2, len(self.vm.shares))  # the new share and root
+        self.assertEqual(1, len(self.vm.shared))  # the new shared
         shared = self.vm.shared[str(shared_id)]
         self.assertEquals('fake_shared', shared.name)
         # check that the uuid is stored in fs
@@ -786,10 +794,12 @@
         self.assertIn(share.volume_id, self.vm.shares)
         self.assertEquals(False, share.accepted)
         # helper method, pylint: disable-msg=C0111
+
         def answer_share(share_id, answer):
             reactor.callLater(0.2, d.callback, (share_id, answer))
             return d
         self.main.action_q.answer_share = answer_share
+
         def callback(result):
             share_id, answer = result
             self.assertEquals(share.volume_id, share_id)
@@ -812,7 +822,7 @@
         response = ListShares(None)
         response.shares = [shared_response]
         self.vm.handle_AQ_SHARES_LIST(response)
-        self.assertEquals(1, len(self.vm.shared)) # the new shares and root
+        self.assertEquals(1, len(self.vm.shared))  # the new shares and root
         shared = self.vm.shared['shared_id']
         self.assertEquals('fake_shared', shared.name)
         # check that the uuid is stored in fs
@@ -829,7 +839,8 @@
         # initialize the the root
         self.vm._got_root('root_uuid')
         # add the shared folder
-        share = Share(path=path, volume_id='share_id', access_level=ACCESS_LEVEL_RO)
+        share = Share(path=path, volume_id='share_id',
+            access_level=ACCESS_LEVEL_RO)
         yield self.vm.add_shared(share)
         self.assertEquals(False, self.vm.shared['share_id'].accepted)
         # check that a answer notify of a missing share don't blowup
@@ -866,7 +877,7 @@
         response = ListShares(None)
         response.shares = [share_response, share_response_1]
         self.vm.handle_AQ_SHARES_LIST(response)
-        self.assertEquals(3, len(self.vm.shares)) # the new shares and root
+        self.assertEquals(3, len(self.vm.shares))  # the new shares and root
         # check that the share is in the shares dict
         self.assertIn('share_id', self.vm.shares)
         self.assertIn('share_id_1', self.vm.shares)
@@ -1025,6 +1036,7 @@
         share = self._create_share()
 
         scratch_d = defer.Deferred()
+
         def fake_rescan_from_scratch(volume_id):
             """A fake get_delta that check the arguments."""
             self.assertEquals(share.volume_id, volume_id)
@@ -1141,8 +1153,8 @@
 
         self.assertTrue(self.vm.shares[share.volume_id].subscribed)
         # create a few files and directories
-        dirs = ['dir', os.path.join('dir','subdir'),
-                os.path.join('dir','empty_dir')]
+        dirs = ['dir', os.path.join('dir', 'subdir'),
+                os.path.join('dir', 'empty_dir')]
         for i, dir in enumerate(dirs):
             path = os.path.join(share.path, dir)
             with allow_writes(os.path.split(share.path)[0]):
@@ -1154,7 +1166,7 @@
             # add a inotify watch to the dir
             yield self.vm._add_watch(path)
         files = ['a_file', os.path.join('dir', 'file'),
-                 os.path.join('dir','subdir','file')]
+                 os.path.join('dir', 'subdir', 'file')]
         for i, file in enumerate(files):
             path = os.path.join(share.path, file)
             with allow_writes(os.path.split(share.path)[0]):
@@ -1188,6 +1200,7 @@
     def _test_subscribe_share_generations(self, share):
         """Test subscribe_share with a generation."""
         scratch_d = defer.Deferred()
+
         def fake_rescan_from_scratch(volume_id):
             """A fake rescan_from_scratch that check the arguments."""
             self.assertEquals(share.volume_id, volume_id)
@@ -1255,7 +1268,7 @@
         self.main.event_q.rm_watch(share.path)
         self.assertTrue(self.vm.shares[share.volume_id].subscribed)
         # create a few files and directories
-        dirs = ['dir', os.path.join('dir','subdir'),
+        dirs = ['dir', os.path.join('dir', 'subdir'),
                 os.path.join('dir', 'empty_dir')]
         for i, dir in enumerate(dirs):
             path = os.path.join(share.path, dir)
@@ -1409,7 +1422,7 @@
                     os.path.join(u'~', u'Documents'),
                     os.path.join(u'~', u'Documents', u'Reading Años'),
                     os.path.join(u'~', u'Documents', u'Reading Años', u'Books')]
-        expected = [os.path.expanduser(p).encode('utf8') for p in expected]
+        expected = [platform.expand_user(p.encode('utf-8')) for p in expected]
 
         udf = self._create_udf(suggested_path=suggested_path)
         self.assertEquals(expected, udf.ancestors)
@@ -1449,10 +1462,39 @@
                       'watch for %r should be present.' % udf.path)
 
     @defer.inlineCallbacks
+    def test_add_udf_with_content(self):
+        """Test for VolumeManager.add_udf with content on disk."""
+        # create a sync instance
+        from ubuntuone.syncdaemon import sync
+        sync = sync.Sync(self.main)
+        suggested_path = u"~/suggested_path"
+        udf = self._create_udf(suggested_path=suggested_path,
+                               subscribed=True)
+        # create some files inside it
+        make_dir(udf.path)
+        for i in range(10):
+            with open_file(os.path.join(udf.path, 'file_%d' % (i,)), 'wb') as f:
+                f.write(os.urandom(10))
+        self.assertEqual(len(os.listdir(udf.path)), 10)
+        # patch the fake action queue to intercept make_file calls
+        called = []
+        self.main.action_q.make_file = lambda *a: called.append(a)
+        yield self.vm.add_udf(udf)
+        self.assertEqual(len(called), 10)
+        # check that the UDF is in the fsm metadata
+        mdobj = self.main.fs.get_by_path(udf.path)
+        self.assertEqual(mdobj.node_id, udf.node_id)
+        self.assertEqual(mdobj.share_id, udf.volume_id)
+        # check that there is a watch in the UDF
+        self.assertIn(udf.path, self.watches,
+                      'watch for %r should be present.' % udf.path)
+
+    @defer.inlineCallbacks
     def test_add_udf_calls_AQ(self):
         """Test that VolumeManager.add_udf calls AQ.rescan_from_scratch."""
         udf = self._create_udf(subscribed=True)
         scratch_d = defer.Deferred()
+
         def fake_rescan_from_scratch(volume_id):
             """A fake rescan_from_scratch that check the arguments."""
             self.assertEquals(udf.volume_id, volume_id)
@@ -1496,7 +1538,7 @@
         self.assertEquals(1, len(self.vm.udfs))
         # create a few files and directories
         dirs = ['dir', os.path.join('dir', 'subdir'),
-                os.path.join('dir','empty_dir')]
+                os.path.join('dir', 'empty_dir')]
         for i, dir in enumerate(dirs):
             path = os.path.join(udf.path, dir)
             if not path_exists(path):
@@ -1505,8 +1547,8 @@
             self.main.fs.set_node_id(path, 'dir_node_id' + str(i))
             # add a inotify watch to the dir
             yield self.vm._add_watch(path)
-        files = ['a_file', os.path.join('dir','file'),
-                 os.path.join('dir','subdir','file')]
+        files = ['a_file', os.path.join('dir', 'file'),
+                 os.path.join('dir', 'subdir', 'file')]
         for i, file in enumerate(files):
             path = os.path.join(udf.path, file)
             self.main.fs.create(path, udf.volume_id)
@@ -1583,8 +1625,8 @@
         self.vm.handle_AQ_LIST_VOLUMES(response)
         yield d1
         yield d2
-        self.assertEqual(2, len(self.vm.shares)) # the new share and root
-        self.assertEqual(1, len(self.vm.udfs)) # the new udf
+        self.assertEqual(2, len(self.vm.shares))  # the new share and root
+        self.assertEqual(1, len(self.vm.udfs))  # the new udf
         # check that the share is in the shares dict
         self.assertIn(str(share_id), self.vm.shares)
         self.assertIn(str(udf_id), self.vm.udfs)
@@ -1600,8 +1642,8 @@
         self.assertEqual(root.node_id, str(root_volume.node_id))
         # now send the same list again and check
         self.vm.handle_AQ_LIST_VOLUMES(response)
-        self.assertEqual(2, len(self.vm.shares)) # the share and root
-        self.assertEqual(1, len(self.vm.udfs)) # one udf
+        self.assertEqual(2, len(self.vm.shares))  # the share and root
+        self.assertEqual(1, len(self.vm.udfs))  # one udf
         # check that the udf is the same.
         new_udf = self.vm.udfs[str(udf_id)]
         self.assertEqual(udf.__dict__, new_udf.__dict__)
@@ -1649,8 +1691,8 @@
         self._listen_for('VM_UDF_CREATED', d.callback)
         self.vm.handle_AQ_LIST_VOLUMES(response)
         yield d
-        self.assertEqual(2, len(self.vm.shares)) # the new shares and root
-        self.assertEqual(1, len(self.vm.udfs)) # the new shares and root
+        self.assertEqual(2, len(self.vm.shares))  # the new shares and root
+        self.assertEqual(1, len(self.vm.udfs))  # the new shares and root
         # check that the share is in the shares dict
         self.assertIn(str(share_id), self.vm.shares)
         self.assertIn(str(udf_id), self.vm.udfs)
@@ -1668,7 +1710,7 @@
         response = [root_volume]
         self.vm.refresh_volumes = lambda: self.fail('refresh_volumes called!')
         self.vm.handle_AQ_LIST_VOLUMES(response)
-        self.assertEqual(1, len(self.vm.shares)) # the new share and root
+        self.assertEqual(1, len(self.vm.shares))  # the new share and root
         # check that the root is in the shares dict
         self.assertIn(request.ROOT, self.vm.shares)
         self.assertEqual(self.vm.shares[request.ROOT].node_id,
@@ -1695,8 +1737,8 @@
         # patch aq.rescan_from_scratch in order to intercept the calls
         root_from_scratch_d = defer.Deferred()
         share_from_scratch_d = defer.Deferred()
-        from_scratch_deferreds = {'':root_from_scratch_d,
-                                  str(share_id):share_from_scratch_d}
+        from_scratch_deferreds = {'': root_from_scratch_d,
+                                  str(share_id): share_from_scratch_d}
         self.patch(self.main.action_q, 'rescan_from_scratch',
            lambda vol_id: from_scratch_deferreds.pop(vol_id).callback(vol_id))
 
@@ -1727,7 +1769,7 @@
 
         def check():
             """The test itself."""
-            self.assertEqual(2, len(self.vm.shares)) # the share and the root
+            self.assertEqual(2, len(self.vm.shares))  # the share and the root
             # check that the share is in the shares dict
             self.assertIn(str(share_id), self.vm.shares)
             share = self.vm.shares[str(share_id)]
@@ -1748,8 +1790,8 @@
         # patch aq.rescan_from_scratch in order to intercept the calls
         root_from_scratch_d = defer.Deferred()
         share_from_scratch_d = defer.Deferred()
-        from_scratch_deferreds = {'':root_from_scratch_d,
-                                  str(share_id):share_from_scratch_d}
+        from_scratch_deferreds = {'': root_from_scratch_d,
+                                  str(share_id): share_from_scratch_d}
         self.patch(self.main.action_q, 'rescan_from_scratch',
            lambda vol_id: from_scratch_deferreds.pop(vol_id).callback(vol_id))
 
@@ -1793,8 +1835,8 @@
         # patch aq.rescan_from_scratch in order to intercept the calls
         root_from_scratch_d = defer.Deferred()
         share_from_scratch_d = defer.Deferred()
-        from_scratch_deferreds = {'':root_from_scratch_d,
-                                  str(udf_id):share_from_scratch_d}
+        from_scratch_deferreds = {'': root_from_scratch_d,
+                                  str(udf_id): share_from_scratch_d}
         self.patch(self.main.action_q, 'rescan_from_scratch',
            lambda vol_id: from_scratch_deferreds.pop(vol_id).callback(vol_id))
 
@@ -1824,7 +1866,7 @@
 
         def check():
             """The test itself."""
-            self.assertEqual(1, len(self.vm.udfs)) # the new udf
+            self.assertEqual(1, len(self.vm.udfs))  # the new udf
             # check that the UDF is in the udfs dict
             self.assertIn(str(udf_id), self.vm.udfs)
             udf = self.vm.udfs[str(udf_id)]
@@ -1879,11 +1921,13 @@
         udf_id = uuid.uuid4()
         node_id = uuid.uuid4()
         # patch AQ.create_udf
+
         def create_udf(path, name, marker):
             """Fake create_udf"""
             self.main.event_q.push("AQ_CREATE_UDF_OK", volume_id=udf_id,
                                    node_id=node_id, marker=marker)
         self.main.action_q.create_udf = create_udf
+
         def check(info):
             """Check the udf attributes."""
             udf = info['udf']
@@ -1908,6 +1952,7 @@
         d = defer.Deferred()
         path = get_udf_path(u"~/ñoño/mirá que lindo mi udf")
         # patch AQ.create_udf
+
         def create_udf(path, name, marker):
             """Fake create_udf"""
             d.callback((path, name))
@@ -1934,10 +1979,12 @@
         yield self.vm.add_share(share)
         d = defer.Deferred()
         # patch AQ.delete_volume
+
         def delete_volume(volume_id, path):
             """Fake delete_volume"""
             self.main.event_q.push("AQ_DELETE_VOLUME_OK", volume_id=volume_id)
         self.main.action_q.delete_volume = delete_volume
+
         def check_udf(info):
             """Check the udf attributes."""
             deleted_udf = info['volume']
@@ -1972,6 +2019,7 @@
         yield self.vm.add_udf(udf)
         d = defer.Deferred()
         # patch AQ.delete_volume
+
         def delete_volume(volume_id, path):
             """Fake AQ.delete_volume."""
             if volume_id == udf.volume_id and path == udf.path:
@@ -2042,6 +2090,7 @@
     def _test_subscribe_udf_generations(self, udf):
         """Test subscribe_udf with a generation."""
         scratch_d = defer.Deferred()
+
         def fake_rescan_from_scratch(volume_id):
             """A fake rescan_from_scratch that check the arguments."""
             self.assertEquals(udf.volume_id, volume_id)
@@ -2092,8 +2141,8 @@
         yield self.vm.add_udf(udf)
         self.assertTrue(self.vm.udfs[udf.volume_id].subscribed)
         # create a few files and directories
-        dirs = ['dir', os.path.join('dir','subdir'),
-                os.path.join('dir','empty_dir')]
+        dirs = ['dir', os.path.join('dir', 'subdir'),
+                os.path.join('dir', 'empty_dir')]
         for i, dir in enumerate(dirs):
             path = os.path.join(udf.path, dir)
             if not path_exists(path):
@@ -2102,8 +2151,8 @@
             self.main.fs.set_node_id(path, 'dir_node_id' + str(i))
             # add a inotify watch to the dir
             yield self.vm._add_watch(path)
-        files = ['a_file', os.path.join('dir','file'),
-                  os.path.join('dir','subdir','file')]
+        files = ['a_file', os.path.join('dir', 'file'),
+                  os.path.join('dir', 'subdir', 'file')]
         for i, file in enumerate(files):
             path = os.path.join(udf.path, file)
             open_file(path, 'w').close()
@@ -2141,7 +2190,7 @@
         self.assertTrue(self.vm.udfs[udf.volume_id].subscribed)
         # create a few files and directories
         dirs = ['dir', os.path.join('dir', 'subdir'),
-                os.path.join('dir','empty_dir')]
+                os.path.join('dir', 'empty_dir')]
         for i, path in enumerate(dirs):
             path = os.path.join(udf.path, path)
             if not path_exists(path):
@@ -2264,6 +2313,7 @@
         udf_id = uuid.uuid4()
         node_id = uuid.uuid4()
         # patch AQ.create_udf
+
         def create_udf(path, name, marker):
             """Fake create_udf"""
             self.main.event_q.push("AQ_CREATE_UDF_OK", volume_id=udf_id,
@@ -2289,6 +2339,7 @@
         d = defer.Deferred()
         path = get_udf_path(u'~/ñoño')
         # patch AQ.create_udf
+
         def create_udf(path, name, marker):
             """Fake create_udf"""
             self.main.event_q.push("AQ_CREATE_UDF_ERROR",
@@ -2297,6 +2348,7 @@
         self._listen_for('VM_UDF_CREATE_ERROR', d.callback)
         # fake VM state, call create_udf
         self.vm.create_udf(path)
+
         def check(info):
             """The callback"""
             self.assertEquals(info['path'], path)
@@ -2312,10 +2364,12 @@
         yield self.vm.add_udf(udf)
         d = defer.Deferred()
         # patch AQ.delete_volume
+
         def delete_volume(vol_id, path):
             """Fake delete_volume"""
             self.main.event_q.push("AQ_DELETE_VOLUME_OK", volume_id=vol_id)
         self.main.action_q.delete_volume = delete_volume
+
         def check(info):
             """Check the udf attributes."""
             deleted_udf = info['volume']
@@ -2336,11 +2390,13 @@
         yield self.vm.add_udf(udf)
         d = defer.Deferred()
         # patch AQ.delete_volume
+
         def delete_volume(vol_id, path):
             """Fake delete_volume"""
             self.main.event_q.push("AQ_DELETE_VOLUME_ERROR",
                                    volume_id=vol_id, error="ERROR!")
         self.main.action_q.delete_volume = delete_volume
+
         def check(info):
             """Check the udf attributes."""
             deleted_udf, error = info['volume_id'], info['error']
@@ -2429,7 +2485,8 @@
         d = defer.Deferred()
         self._listen_for('VM_UDF_CREATED', d.callback)
         rescan_cb = defer.Deferred()
-        self.patch(self.main.action_q, 'rescan_from_scratch', rescan_cb.callback)
+        self.patch(self.main.action_q, 'rescan_from_scratch',
+            rescan_cb.callback)
 
         self.vm.handle_SV_VOLUME_CREATED(udf_volume)
         info = yield d
@@ -2669,6 +2726,7 @@
         self.vm._got_root('root_uuid')
         udf_path = os.path.join(self.root_dir, 'udf_inside_root')
         # patch FakeAQ
+
         def create_udf(path, name, marker):
             """Fake create_udf"""
             d = dict(volume_id=uuid.uuid4(), node_id=uuid.uuid4(),
@@ -2692,6 +2750,7 @@
         udf_child = os.path.join(udf.path, 'd')
         yield self.vm.add_udf(udf)
         # patch FakeAQ
+
         def create_udf(path, name, marker):
             """Fake create_udf"""
             self.main.event_q.push("AQ_CREATE_UDF_OK", volume_id=uuid.uuid4(),
@@ -2713,6 +2772,7 @@
         yield self.vm.add_udf(udf)
         udf_parent_path = os.path.dirname(udf.path)
         # patch FakeAQ
+
         def create_udf(path, name, marker):
             """Fake create_udf."""
             self.main.event_q.push("AQ_CREATE_UDF_OK", volume_id=uuid.uuid4(),
@@ -2784,8 +2844,8 @@
         self._listen_for('VM_UDF_CREATED', d.callback)
         self.vm.handle_AQ_LIST_VOLUMES(response)
         yield d
-        self.assertEquals(2, len(self.vm.shares)) # the new share and root
-        self.assertEquals(1, len(self.vm.udfs)) # the new udf
+        self.assertEquals(2, len(self.vm.shares))  # the new share and root
+        self.assertEquals(1, len(self.vm.udfs))  # the new udf
         shared_id = uuid.uuid4()
         shared_response = ShareResponse.from_params(shared_id, 'from_me',
                                                    'fake_share_uuid',
@@ -2796,7 +2856,7 @@
         shares_response.shares = [shared_response]
         self.vm.handle_AQ_SHARES_LIST(shares_response)
         # check that all the shares are still there
-        self.assertEquals(2, len(self.vm.shares)) # the new share and root
+        self.assertEquals(2, len(self.vm.shares))  # the new share and root
 
     @defer.inlineCallbacks
     def test_handle_SV_FREE_SPACE(self):
@@ -2811,6 +2871,7 @@
         yield self.vm.add_udf(udf)
         # override AQ.check_conditions
         d = defer.Deferred()
+
         def check_conditions():
             """Fake check_conditions that just keep count of calls."""
             if d.called:
@@ -2882,6 +2943,7 @@
         real_udf_path = os.path.join(self.home_dir, "my_udf")
         udf_path = os.path.join(self.home_dir, "MyUDF")
         # patch FakeAQ
+
         def create_udf(path, name, marker):
             """Fake create_udf"""
             self.main.event_q.push("AQ_CREATE_UDF_OK", volume_id=uuid.uuid4(),
@@ -2907,6 +2969,7 @@
         real_udf_path = os.path.join(self.home_dir, "udf_parent", "my_udf")
         udf_path = os.path.join(self.home_dir, "MyUDF")
         # patch FakeAQ
+
         def create_udf(path, name, marker):
             """Fake create_udf"""
             self.main.event_q.push("AQ_CREATE_UDF_OK", volume_id=uuid.uuid4(),
@@ -2968,8 +3031,8 @@
         # patch aq.rescan_from_scratch in order to intercept the calls
         root_from_scratch_d = defer.Deferred()
         share_from_scratch_d = defer.Deferred()
-        from_scratch_deferreds = {'':root_from_scratch_d,
-                                  str(share_id):share_from_scratch_d}
+        from_scratch_deferreds = {'': root_from_scratch_d,
+                                  str(share_id): share_from_scratch_d}
         self.patch(self.main.action_q, 'rescan_from_scratch',
            lambda vol_id: from_scratch_deferreds.pop(vol_id).callback(vol_id))
 
@@ -3010,8 +3073,8 @@
         # patch aq.rescan_from_scratch in order to intercept the calls
         root_from_scratch_d = defer.Deferred()
         udf_from_scratch_d = defer.Deferred()
-        from_scratch_deferreds = {'':root_from_scratch_d,
-                                  str(udf_id):udf_from_scratch_d}
+        from_scratch_deferreds = {'': root_from_scratch_d,
+                                  str(udf_id): udf_from_scratch_d}
         self.patch(self.main.action_q, 'rescan_from_scratch',
            lambda vol_id: from_scratch_deferreds.pop(vol_id).callback(vol_id))
 
@@ -3059,9 +3122,9 @@
         root_from_scratch_d = defer.Deferred()
         share_from_scratch_d = defer.Deferred()
         udf_from_scratch_d = defer.Deferred()
-        from_scratch_deferreds = {'':root_from_scratch_d,
-                                  str(share_id):share_from_scratch_d,
-                                  str(udf_id):udf_from_scratch_d}
+        from_scratch_deferreds = {'': root_from_scratch_d,
+                                  str(share_id): share_from_scratch_d,
+                                  str(udf_id): udf_from_scratch_d}
         self.patch(self.main.action_q, 'rescan_from_scratch',
            lambda vol_id: from_scratch_deferreds.pop(vol_id).callback(vol_id))
 
@@ -3092,7 +3155,8 @@
     def test_server_rescan_error(self):
         """Test the server_rescan method."""
         # patch fake action queue
-        self.main.action_q.query_volumes = lambda: defer.fail(Exception('foo bar'))
+        self.main.action_q.query_volumes = lambda: defer.fail(
+            Exception('foo bar'))
         d = defer.Deferred()
         self._listen_for('SYS_SERVER_RESCAN_ERROR', d.callback)
         yield self.vm.server_rescan()
@@ -3101,6 +3165,7 @@
         # patch fake action queue
         self.main.action_q.query_volumes = lambda: defer.succeed([])
         # patch volume manager
+
         def broken_volumes_rescan_cb(_):
             raise ValueError('die!')
         self.vm._volumes_rescan_cb = broken_volumes_rescan_cb
@@ -3123,7 +3188,7 @@
         yield self.vm.server_rescan()
         called = yield d
         self.assertTrue(called)
-    test_refresh_shares_called_after_server_rescan.timeout  = 1
+    test_refresh_shares_called_after_server_rescan.timeout = 1
 
     @defer.inlineCallbacks
     def test_server_rescan_clean_dead_udf(self):
@@ -3262,7 +3327,7 @@
                            for event in events)
         self.assertIn(str(share_id), events_dict)
         self.assertIn(str(udf_id), events_dict)
-        self.assertNotIn(request.ROOT, events_dict) # same gen as metadata
+        self.assertNotIn(request.ROOT, events_dict)  # same gen as metadata
         self.assertEqual(10, events_dict[str(share_id)])
         self.assertEqual(5, events_dict[str(udf_id)])
         # now only change the root volume generation
@@ -3278,7 +3343,7 @@
                            for event in events)
         self.assertNotIn(str(share_id), events_dict)
         self.assertNotIn(str(udf_id), events_dict)
-        self.assertIn(request.ROOT, events_dict) # same generation as metadata
+        self.assertIn(request.ROOT, events_dict)  # same generation as metadata
         self.assertEqual(100, events_dict[request.ROOT])
 
     @defer.inlineCallbacks
@@ -3368,7 +3433,8 @@
         # delete the fsm metadata
         self.main.fs.delete_metadata(udf.path)
         d = defer.Deferred()
-        self._listen_for('SV_VOLUME_NEW_GENERATION', d.callback, 2, collect=True)
+        self._listen_for('SV_VOLUME_NEW_GENERATION', d.callback, 2,
+            collect=True)
         self.patch(self.vm, '_scan_volume', defer.succeed)
         self.vm._volumes_rescan_cb(response)
         events = yield d
@@ -3441,7 +3507,8 @@
         yield self.vm.add_udf(udf)
         self.vm.update_generation(udf.volume_id, 10)
         d = defer.Deferred()
-        self.patch(self.main.action_q, 'get_delta', lambda v, g: d.callback((v, g)))
+        self.patch(self.main.action_q, 'get_delta',
+            lambda v, g: d.callback((v, g)))
         self.main.event_q.push('SV_VOLUME_NEW_GENERATION',
                                volume_id=udf.volume_id, generation=100)
         vol_id, gen = yield d
@@ -3501,7 +3568,8 @@
         self.vm._got_root('root_node_id')
         self.vm.update_generation(root.volume_id, 10)
         d = defer.Deferred()
-        self.patch(self.main.action_q, 'get_delta', lambda v, g: d.callback((v, g)))
+        self.patch(self.main.action_q, 'get_delta',
+            lambda v, g: d.callback((v, g)))
         self.main.event_q.push('SV_VOLUME_NEW_GENERATION',
                                volume_id=root.volume_id, generation=100)
         vol_id, gen = yield d
@@ -3544,7 +3612,8 @@
         yield self.vm.add_share(share)
         self.vm.update_generation(share.volume_id, 10)
         d = defer.Deferred()
-        self.patch(self.main.action_q, 'get_delta', lambda v, g: d.callback((v, g)))
+        self.patch(self.main.action_q, 'get_delta',
+            lambda v, g: d.callback((v, g)))
         self.main.event_q.push('SV_VOLUME_NEW_GENERATION',
                                volume_id=share.volume_id, generation=100)
         vol_id, gen = yield d
@@ -3650,7 +3719,7 @@
         response = ListShares(None)
         response.shares = [share_response]
         self.vm.handle_AQ_SHARES_LIST(response)
-        self.assertEquals(1, len(self.vm.shared)) # the new shares and root
+        self.assertEquals(1, len(self.vm.shared))  # the new shares and root
         # check that the share is in the shares dict
         self.assertIn(str(share_id), self.vm.shared)
         shared = self.vm.shared[str(share_id)]
@@ -3674,7 +3743,8 @@
         """Create some directories."""
         yield super(MetadataTestCase, self).setUp()
         self.home_dir = self.mktemp('ubuntuonehacker')
-        self.root_dir = self.mktemp(os.path.join('ubuntuonehacker', 'Ubuntu One'))
+        self.root_dir = self.mktemp(
+            os.path.join('ubuntuonehacker', 'Ubuntu One'))
         self.data_dir = os.path.join(self.tmpdir, 'data_dir')
         self.vm_data_dir = os.path.join(self.tmpdir, 'data_dir', 'vm')
         self.partials_dir = self.mktemp('partials')
@@ -3708,8 +3778,10 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(GenerationsMetadataTestCase, self).setUp()
-        self.share_md_dir = self.mktemp(os.path.join(self.vm_data_dir, 'shares'))
-        self.shared_md_dir = self.mktemp(os.path.join(self.vm_data_dir, 'shared'))
+        self.share_md_dir = self.mktemp(
+            os.path.join(self.vm_data_dir, 'shares'))
+        self.shared_md_dir = self.mktemp(
+            os.path.join(self.vm_data_dir, 'shared'))
         self.shares_dir = self.mktemp('shares')
         self.shares_dir_link = os.path.join(self.u1_dir, 'Shared With Me')
         make_link(self.shares_dir, self.shares_dir_link)
@@ -3735,7 +3807,7 @@
         legacy_shares[root.volume_id] = root.__dict__
         udf = UDF(volume_id=str(uuid.uuid4()), node_id='udf_node_id',
                   suggested_path='~/UDF',
-                  path=os.path.join('a','fake','UDF'))
+                  path=os.path.join('a', 'fake', 'UDF'))
         udf.__dict__.pop('generation')
         legacy_udfs[udf.volume_id] = udf.__dict__
         shares = VMFileShelf(self.share_md_dir)
@@ -3770,8 +3842,10 @@
     def setUp(self):
         """Create the MetadataUpgrader instance."""
         yield super(MetadataUpgraderTests, self).setUp()
-        self.share_md_dir = self.mktemp(os.path.join(self.vm_data_dir, 'shares'))
-        self.shared_md_dir = self.mktemp(os.path.join(self.vm_data_dir, 'shared'))
+        self.share_md_dir = self.mktemp(
+            os.path.join(self.vm_data_dir, 'shares'))
+        self.shared_md_dir = self.mktemp(
+            os.path.join(self.vm_data_dir, 'shared'))
         self.udfs_md_dir = os.path.join(self.vm_data_dir, 'udfs')
         self._tritcask_dir = self.mktemp('tritcask')
         self.shares_dir = self.mktemp('shares')
@@ -3786,6 +3860,7 @@
                                             self.udfs_md_dir, self.root_dir,
                                             self.shares_dir,
                                             self.shares_dir_link, self.db)
+
     @defer.inlineCallbacks
     def tearDown(self):
         """Restorre _get_md_version"""
@@ -3801,7 +3876,7 @@
                      self.root_dir, self.shares_dir]:
             if path_exists(path):
                 self.rmtree(path)
-        make_dir(os.path.join(self.root_dir, 'My Files'),recursive=True)
+        make_dir(os.path.join(self.root_dir, 'My Files'), recursive=True)
         shares_dir = os.path.join(self.root_dir, 'Shared With Me')
         make_dir(shares_dir, recursive=True)
         set_dir_readonly(self.root_dir)
@@ -3843,7 +3918,7 @@
         """Test _guess_metadata_version method for version 5."""
         # fake a version 5 layout and metadata
         shelf = LegacyShareFileShelf(self.share_md_dir)
-        shelf['foobar'] = _Share(path=os.path.join('foo','bar'),
+        shelf['foobar'] = _Share(path=os.path.join('foo', 'bar'),
                                  share_id='foobar')
         version = self.md_upgrader._guess_metadata_version()
         self.assertEquals(version, '5')
@@ -3852,7 +3927,7 @@
         """Test _guess_metadata_version method for version 6."""
         # fake a version 6 layout and metadata
         shelf = VMFileShelf(self.share_md_dir)
-        shelf['foobar'] = Share(path=os.path.join('foo','bar'),
+        shelf['foobar'] = Share(path=os.path.join('foo', 'bar'),
                                 volume_id='foobar')
         version = self.md_upgrader._guess_metadata_version()
         self.assertEquals(version, '6')
@@ -3861,9 +3936,9 @@
         """Test _guess_metadata_version method for mixed version 5 and 6."""
         # fake a version 6 layout and metadata
         shelf = LegacyShareFileShelf(self.share_md_dir)
-        shelf['old_share'] = _Share(path=os.path.join('foo','bar'),
+        shelf['old_share'] = _Share(path=os.path.join('foo', 'bar'),
                                     share_id='old_share')
-        shelf['new_share'] = Share(path=os.path.join('bar','foo'),
+        shelf['new_share'] = Share(path=os.path.join('bar', 'foo'),
                                    volume_id='new_share').__dict__
         version = self.md_upgrader._guess_metadata_version()
         self.assertEquals(version, '5')
@@ -3883,7 +3958,7 @@
     def test_upgrade_metadata_5_no_os_rename(self):
         """Test that when we upgrade we use the os_helper.rename."""
         shelf = LegacyShareFileShelf(self.share_md_dir)
-        shelf['foobar'] = _Share(path=os.path.join('foo','bar'),
+        shelf['foobar'] = _Share(path=os.path.join('foo', 'bar'),
                                  share_id='foobar')
         mocker = Mocker()
         # ensure that we do use the platform method and not the renamed one
@@ -3945,8 +4020,8 @@
     def test_store_dicts(self):
         """Test that the info stored for a volume is actually a dict."""
         udf = UDF(volume_id=str(uuid.uuid4()), node_id='udf_node_id',
-                  suggested_path= '~/UDF',
-                  path=os.path.join('a', 'fake','UDF'))
+                  suggested_path='~/UDF',
+                  path=os.path.join('a', 'fake', 'UDF'))
         self.shelf[udf.volume_id] = udf
         self.assertEqual(udf, self.shelf[udf.volume_id])
         pickled_dict = self.shelf._db.get(1000, udf.volume_id)

=== modified file 'tests/syncdaemon/test_vm_helper.py'
--- tests/syncdaemon/test_vm_helper.py	2011-08-17 20:20:21 +0000
+++ tests/syncdaemon/test_vm_helper.py	2011-12-19 20:54:24 +0000
@@ -26,7 +26,7 @@
 from tests.syncdaemon.test_vm import BaseVolumeManagerTests
 
 from contrib.testing.testcase import BaseTwistedTestCase
-from ubuntuone.platform import os_helper
+from ubuntuone.platform import expand_user, os_helper
 from ubuntuone.syncdaemon import vm_helper
 from ubuntuone.syncdaemon.vm_helper import (
     create_shares_link,
@@ -46,7 +46,7 @@
 
         path = get_udf_path(suggested_path)
         expected = suggested_path.replace(u'/', os.path.sep)
-        expected = os.path.expanduser(expected.encode('utf8'))
+        expected = expand_user(expected.encode('utf8'))
         self.assertEqual(path, expected)
 
     def test_get_udf_path(self):

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2011-10-05 21:08:10 +0000
+++ ubuntuone/platform/__init__.py	2011-12-19 20:54:24 +0000
@@ -1,5 +1,26 @@
+# -*- encoding: utf-8 -*-
+#
+# Copyright 2009-2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Platform specific bindings."""
+
+import os
 import sys
 
+from ubuntu_sso.xdg_base_directory import xdg_home
+
 # very hackish way to avoid "import *" to satisfy pyflakes
 # and to avoid import ubuntuone.platform.X as source (it wont work)
 
@@ -13,6 +34,68 @@
 from ubuntuone.platform import credentials
 from ubuntuone.platform import tools
 
-target = sys.modules[__name__]
-for k in dir(source):
-    setattr(target, k, getattr(source, k))
+
+def expand_user(path):
+    """Fix Python expanduser for weird chars in windows."""
+    # Receives bytes, returns unicode
+    assert isinstance(path, str)
+    try:
+        path.decode('utf-8')
+    except UnicodeDecodeError:
+        raise AssertionError('The path %r must be encoded in utf-8' % path)
+    tilde = '~'
+    if not path.startswith(tilde) or \
+    (len(path) > 1 and path[1:2] != os.path.sep):
+        return path
+    result = path.replace('~', xdg_home, 1)
+
+    assert isinstance(result, str)
+    try:
+        result.decode('utf-8')
+    except UnicodeDecodeError:
+        raise AssertionError('The path %r must be encoded in utf-8' % result)
+    return result
+
+
+platform = source.platform
+access = source.access
+allow_writes = source.allow_writes
+can_write = source.can_write
+get_path_list = source.get_path_list
+is_link = source.is_link
+is_root = source.is_root
+listdir = source.listdir
+make_dir = source.make_dir
+make_link = source.make_link
+move_to_trash = source.move_to_trash
+native_rename = source.native_rename
+normpath = source.normpath
+open_file = source.open_file
+path_exists = source.path_exists
+read_link = source.read_link
+recursive_move = source.recursive_move
+remove_dir = source.remove_dir
+remove_file = source.remove_file
+remove_link = source.remove_link
+remove_tree = source.remove_tree
+rename = source.rename
+set_application_name = source.set_application_name
+set_dir_readonly = source.set_dir_readonly
+set_dir_readwrite = source.set_dir_readwrite
+set_file_readonly = source.set_file_readonly
+set_file_readwrite = source.set_file_readwrite
+set_no_rights = source.set_no_rights
+stat_path = source.stat_path
+walk = source.walk
+
+# From Logger
+setup_filesystem_logging = source.setup_filesystem_logging
+get_filesystem_logger = source.get_filesystem_logger
+
+# From File System Notifications
+FilesystemMonitor = source.FilesystemMonitor
+_GeneralINotifyProcessor = source._GeneralINotifyProcessor
+
+# IPC
+ExternalInterface = source.ExternalInterface
+is_already_running = source.is_already_running

=== added file 'ubuntuone/platform/constants.py'
--- ubuntuone/platform/constants.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/constants.py	2011-12-19 20:54:24 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Constants for the proper platform."""
+
+# To start hashing a file, no new hash request should arrive
+# for it within this amount of seconds:
+
+import sys
+
+if sys.platform == "win32":
+    HASHQUEUE_DELAY = 3.0
+else:
+    HASHQUEUE_DELAY = 0.5

=== added file 'ubuntuone/platform/event_logging.py'
--- ubuntuone/platform/event_logging.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/event_logging.py	2011-12-19 20:54:24 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Builds a syncdaemon listener that logs events if ZG is installed."""
+
+import sys
+
+
+if sys.platform == "win32":
+    from ubuntuone.platform.windows import event_logging
+    source = event_logging
+else:
+    from ubuntuone.platform.linux import event_logging
+    source = event_logging
+    is_zeitgeist_installed = source.is_zeitgeist_installed
+
+get_listener = source.get_listener

=== added file 'ubuntuone/platform/launcher.py'
--- ubuntuone/platform/launcher.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/launcher.py	2011-12-19 20:54:24 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Use libunity to show a progressbar and emblems on the launcher icon."""
+
+import sys
+
+
+if sys.platform == "win32":
+    from ubuntuone.platform.windows import launcher
+    source = launcher
+else:
+    from ubuntuone.platform.linux import launcher
+    source = launcher
+
+U1_DOTDESKTOP = source.U1_DOTDESKTOP
+
+UbuntuOneLauncher = source.UbuntuOneLauncher
+DummyLauncher = source.DummyLauncher

=== modified file 'ubuntuone/platform/linux/__init__.py'
--- ubuntuone/platform/linux/__init__.py	2011-10-21 15:49:18 +0000
+++ ubuntuone/platform/linux/__init__.py	2011-12-19 20:54:24 +0000
@@ -20,6 +20,7 @@
 
 platform = "linux"
 
+
 from ubuntuone.platform.linux.os_helper import (
     access,
     allow_writes,

=== modified file 'ubuntuone/platform/linux/messaging.py'
--- ubuntuone/platform/linux/messaging.py	2011-07-06 16:59:58 +0000
+++ ubuntuone/platform/linux/messaging.py	2011-12-19 20:54:24 +0000
@@ -40,8 +40,6 @@
 from ubuntuone.status.messaging import AbstractMessaging
 from ubuntuone.status.logger import logger
 
-APPLICATION_NAME = 'Ubuntu One Client'
-
 
 # pylint: disable=W0613
 def open_volumes():

=== modified file 'ubuntuone/platform/linux/session.py'
--- ubuntuone/platform/linux/session.py	2011-10-14 20:02:23 +0000
+++ ubuntuone/platform/linux/session.py	2011-12-19 20:54:24 +0000
@@ -21,16 +21,16 @@
 
 from twisted.internet import defer
 
-SESSION_MANAGER_BUSNAME = "org.gnome.SessionManager"
-SESSION_MANAGER_IFACE = "org.gnome.SessionManager"
-SESSION_MANAGER_PATH = "/org/gnome/SessionManager"
-
 INHIBIT_LOGGING_OUT = 1
 INHIBIT_USER_SWITCHING = 2
 INHIBIT_SUSPENDING_COMPUTER = 4
 INHIBIT_SESSION_IDLE = 8
 INHIBIT_LOGOUT_SUSPEND = INHIBIT_LOGGING_OUT | INHIBIT_SUSPENDING_COMPUTER
 
+SESSION_MANAGER_BUSNAME = "org.gnome.SessionManager"
+SESSION_MANAGER_IFACE = "org.gnome.SessionManager"
+SESSION_MANAGER_PATH = "/org/gnome/SessionManager"
+
 APP_ID = "Ubuntu One"
 TOPLEVEL_XID = 0
 

=== added file 'ubuntuone/platform/messaging.py'
--- ubuntuone/platform/messaging.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/messaging.py	2011-12-19 20:54:24 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 *-*
+# ubuntuone.syncdaemon.platform.messaging - Messages to the user
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Module that implements sending messages to the end user."""
+
+# TODO: We may want to enable different messaging systems. When none
+# of them are available, we should fall back to silently discarding
+# messages.
+
+import sys
+
+
+APPLICATION_NAME = 'Ubuntu One Client'
+
+
+if sys.platform == "win32":
+    from ubuntuone.platform.windows import messaging
+    source = messaging
+    hide_message = source.hide_message
+else:
+    from ubuntuone.platform.linux import messaging
+    source = messaging
+    DBUS_BUS_NAME = source.DBUS_BUS_NAME
+    DBUS_IFACE_GUI = source.DBUS_IFACE_GUI
+    TRANSLATION_DOMAIN = source.TRANSLATION_DOMAIN
+    _server_callback = source._server_callback
+
+Messaging = source.Messaging
+open_volumes = source.open_volumes

=== added file 'ubuntuone/platform/notification.py'
--- ubuntuone/platform/notification.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/notification.py	2011-12-19 20:54:24 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 *-*
+# ubuntuone.syncdaemon.platform.notification - User Notification
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Module that implements notification of the end user."""
+
+import sys
+
+
+if sys.platform == "win32":
+    from ubuntuone.platform.windows import notification
+    source = notification
+else:
+    from ubuntuone.platform.linux import notification
+    source = notification
+    NOTIFY_MODULE = source.NOTIFY_MODULE
+    ICON_NAME = source.ICON_NAME
+
+
+APPLICATION_NAME = source.APPLICATION_NAME
+
+Notification = source.Notification

=== added file 'ubuntuone/platform/os_helper.py'
--- ubuntuone/platform/os_helper.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/os_helper.py	2011-12-19 20:54:24 +0000
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Multiplatform tools to interact with the os."""
+
+import sys
+
+
+if sys.platform == "win32":
+    from ubuntuone.platform.windows import os_helper
+    source = os_helper
+else:
+    from ubuntuone.platform.linux import os_helper
+    source = os_helper
+
+set_no_rights = source.set_no_rights
+set_file_readonly = source.set_file_readonly
+set_file_readwrite = source.set_file_readwrite
+set_dir_readonly = source.set_dir_readonly
+set_dir_readwrite = source.set_dir_readwrite
+allow_writes = source.allow_writes
+remove_file = source.remove_file
+remove_tree = source.remove_tree
+remove_dir = source.remove_dir
+path_exists = source.path_exists
+make_dir = source.make_dir
+open_file = source.open_file
+rename = source.rename
+native_rename = source.native_rename
+recursive_move = source.recursive_move
+make_link = source.make_link
+read_link = source.read_link
+is_link = source.is_link
+remove_link = source.remove_link
+listdir = source.listdir
+walk = source.walk
+access = source.access
+can_write = source.can_write
+stat_path = source.stat_path
+move_to_trash = source.move_to_trash
+set_application_name = source.set_application_name
+is_root = source.is_root
+get_path_list = source.get_path_list
+normpath = source.normpath

=== added file 'ubuntuone/platform/session.py'
--- ubuntuone/platform/session.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/session.py	2011-12-19 20:54:24 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Inhibit session logout when busy."""
+
+import sys
+
+
+INHIBIT_LOGGING_OUT = 1
+INHIBIT_USER_SWITCHING = 2
+INHIBIT_SUSPENDING_COMPUTER = 4
+INHIBIT_SESSION_IDLE = 8
+INHIBIT_LOGOUT_SUSPEND = INHIBIT_LOGGING_OUT | INHIBIT_SUSPENDING_COMPUTER
+
+
+if sys.platform == "win32":
+    from ubuntuone.platform.windows import session
+    source = session
+else:
+    from ubuntuone.platform.linux import session
+    source = session
+    SESSION_MANAGER_BUSNAME = source.SESSION_MANAGER_BUSNAME
+    SESSION_MANAGER_IFACE = source.SESSION_MANAGER_IFACE
+    SESSION_MANAGER_PATH = source.SESSION_MANAGER_PATH
+    APP_ID = source.APP_ID
+    TOPLEVEL_XID = source.TOPLEVEL_XID
+
+
+Inhibitor = source.Inhibitor
+
+
+def inhibit_logout_suspend(reason):
+    """Inhibit the suspend and logout. The result can be cancelled."""
+    return Inhibitor().inhibit(INHIBIT_LOGOUT_SUSPEND, reason)

=== modified file 'ubuntuone/platform/tools/windows.py'
--- ubuntuone/platform/tools/windows.py	2011-11-07 15:39:32 +0000
+++ ubuntuone/platform/tools/windows.py	2011-12-19 20:54:24 +0000
@@ -16,7 +16,10 @@
 
 """SyncDaemon Tools."""
 
+import errno
 import subprocess
+import sys
+import os
 
 from twisted.internet import defer
 from _winreg import OpenKey, HKEY_LOCAL_MACHINE, QueryValueEx
@@ -30,6 +33,11 @@
 U1_REG_PATH = r'Software\\Ubuntu One'
 SD_INSTALL_PATH = 'SyncDaemonInstallPath'
 
+# ugly trick to stop pylint for complaining about
+# WindowsError on Linux
+if sys.platform != 'win32':
+    WindowsError = None
+
 
 class IPCError(Exception):
     """An IPC specific error signal."""
@@ -154,5 +162,9 @@
         # to launch the sd on windows
         key = OpenKey(HKEY_LOCAL_MACHINE, U1_REG_PATH)
         path = QueryValueEx(key, SD_INSTALL_PATH)[0]
+        if not os.path.exists(path):
+            # either the .exe was moved of the value is wrong
+            return defer.fail(WindowsError(errno.ENOENT,
+                'Could not start syncdaemon: File not found %s' % path))
         p = subprocess.Popen([path])
         return defer.succeed(p)

=== modified file 'ubuntuone/platform/windows/__init__.py'
--- ubuntuone/platform/windows/__init__.py	2011-10-21 15:49:18 +0000
+++ ubuntuone/platform/windows/__init__.py	2011-12-19 20:54:24 +0000
@@ -22,6 +22,16 @@
 platform = "win32"
 
 
+import constants
+import event_logging
+import filesystem_notifications
+import launcher
+import logger
+import messaging
+import notification
+import os_helper
+import session
+
 from ubuntuone.platform.windows.os_helper import (
     access,
     allow_writes,

=== modified file 'ubuntuone/platform/windows/messaging.py'
--- ubuntuone/platform/windows/messaging.py	2011-02-08 22:12:36 +0000
+++ ubuntuone/platform/windows/messaging.py	2011-12-19 20:54:24 +0000
@@ -23,8 +23,6 @@
 
 from ubuntuone.status.messaging import AbstractMessaging
 
-APPLICATION_NAME = 'Ubuntu One Client'
-
 
 class Messaging(AbstractMessaging):
     """Notification of the end user."""

=== modified file 'ubuntuone/platform/windows/os_helper.py'
--- ubuntuone/platform/windows/os_helper.py	2011-10-14 20:02:23 +0000
+++ ubuntuone/platform/windows/os_helper.py	2011-12-19 20:54:24 +0000
@@ -1,5 +1,4 @@
-# Authors: Manuel de la Pena <[e-mail]>
-#          Natalia B. Bidart <[e-mail]>
+# -*- encoding: utf-8 -*-
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -32,12 +31,14 @@
     FILE_GENERIC_WRITE,
     FILE_ALL_ACCESS,
 )
+import win32api
 from pywintypes import error as PyWinError
-from win32api import GetUserName
 from win32com.client import Dispatch
 from win32com.shell import shell, shellcon
 from win32file import (
+    GetFileAttributesW,
     MoveFileExW,
+    FILE_ATTRIBUTE_SYSTEM,
     MOVEFILE_COPY_ALLOWED,
     MOVEFILE_REPLACE_EXISTING,
     MOVEFILE_WRITE_THROUGH,
@@ -49,9 +50,12 @@
     CreateWellKnownSid,
     DACL_SECURITY_INFORMATION,
     GetFileSecurity,
+    GetSecurityInfo,
     LookupAccountName,
     OBJECT_INHERIT_ACE,
+    OWNER_SECURITY_INFORMATION,
     SetFileSecurity,
+    SE_KERNEL_OBJECT,
     WinBuiltinAdministratorsSid,
     WinWorldSid,
 )
@@ -65,11 +69,13 @@
 logger = logging.getLogger('ubuntuone.SyncDaemon.VM')
 platform = 'win32'
 
+# missing win32file constant
+INVALID_FILE_ATTRIBUTES = -1
+
 # LONG_PATH_PREFIX will always be appended only to windows paths,
 # which should always be unicode.
 LONG_PATH_PREFIX = u'\\\\?\\'
 
-USER_SID = LookupAccountName("", GetUserName())[0]
 EVERYONE_SID = CreateWellKnownSid(WinWorldSid)
 ADMINISTRATORS_SID = CreateWellKnownSid(WinBuiltinAdministratorsSid)
 
@@ -93,6 +99,16 @@
     LINUX_ILLEGAL_CHARS_MAP[value] = key
 
 
+def get_user_sid():
+    process_handle = win32api.GetCurrentProcess()
+    security_info = GetSecurityInfo(process_handle, SE_KERNEL_OBJECT,
+                                    OWNER_SECURITY_INFORMATION)
+    return security_info.GetSecurityDescriptorOwner()
+
+
+USER_SID = get_user_sid()
+
+
 def _int_to_bin(n):
     """Convert an int to a bin string of 32 bits."""
     return "".join([str((n >> y) & 1) for y in range(32 - 1, -1, -1)])
@@ -417,7 +433,7 @@
 def _set_file_attributes(path, groups):
     """Set file attributes using the wind32api."""
     if not os.path.exists(path):
-        raise WindowsError('Path %s could not be found.' % path)
+        raise WindowsError(errno.ENOENT, 'Path %s could not be found.' % path)
 
     # No need to do any specific handling for invalid characters since
     # 'path' is a valid windows path.
@@ -627,6 +643,11 @@
         shortcut = shell_script.CreateShortCut(destination)
         shortcut.Targetpath = target
         shortcut.save()
+    except AttributeError:
+        # This try-except is required at least for the current implementation
+        # to allow the application to run even when the paths has unicode chars
+        logger.exception('Link couldn\'t be created for '
+                'destination %r:', destination)
     except:
         logger.exception('make_link could not be completed for target %r, '
                          'destination %r:', target, destination)
@@ -653,6 +674,14 @@
     return os.path.exists(path)
 
 
+def native_is_system_path(path):
+    """Return if the path has the sys attr."""
+    attrs = GetFileAttributesW(path)
+    if attrs == INVALID_FILE_ATTRIBUTES:
+        return False
+    return FILE_ATTRIBUTE_SYSTEM & attrs == FILE_ATTRIBUTE_SYSTEM
+
+
 @windowspath()
 def remove_link(path):
     """Removes a link."""
@@ -686,7 +715,12 @@
     if not directory.endswith(os.path.sep):
         directory += os.path.sep
 
-    return map(_unicode_to_bytes, os.listdir(directory))
+    # On top of the above we have the issue in which python os.listdir does
+    # return those paths that are system paths. Those paths are the ones that
+    # we do not want to work with.
+
+    return map(_unicode_to_bytes, [p for p in os.listdir(directory) if not
+        native_is_system_path(os.path.join(directory, p))])
 
 
 @windowspath()
@@ -701,10 +735,17 @@
     handled.
 
     """
+    # Interestingly, while os.listdir DOES return the system folders, os.walk
+    # does not. Nevertheless lets filter the same way in here so that if python
+    # os.walk changes at some point, we do the same in BOTH methods.
     for dirpath, dirnames, filenames in os.walk(path, topdown):
         dirpath = _unicode_to_bytes(dirpath.replace(LONG_PATH_PREFIX, u''))
-        dirnames = map(_unicode_to_bytes, dirnames)
-        filenames = map(_unicode_to_bytes, filenames)
+        if native_is_system_path(dirpath):
+            continue
+        dirnames = map(_unicode_to_bytes, [p for p in dirnames if
+             not native_is_system_path(os.path.join(dirpath, p))])
+        filenames = map(_unicode_to_bytes, [p for p in filenames if not
+                native_is_system_path(os.path.join(dirpath, p))])
         yield dirpath, dirnames, filenames
 
 

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2011-10-21 15:49:18 +0000
+++ ubuntuone/status/aggregator.py	2011-12-19 20:54:24 +0000
@@ -646,12 +646,14 @@
         lines = []
         files_uploading = len(self.files_uploading)
         if files_uploading > 0:
+            self.uploading_filename = os.path.basename(
+                self.files_uploading[0].path)
             lines.append(files_being_uploaded(
                 self.uploading_filename, files_uploading))
         files_downloading = len(self.files_downloading)
         if files_downloading > 0:
-            self.downloading_filename = self.files_downloading[0].path.split(
-                os.path.sep)[-1]
+            self.downloading_filename = os.path.basename(
+                self.files_downloading[0].path)
             lines.append(files_being_downloaded(
                 self.downloading_filename, files_downloading))
         return "\n".join(lines)
@@ -712,8 +714,8 @@
                 (command.share_id, command.node_id)] = command.deflated_size
         # pylint: disable=W0201
         if not self.downloading_filename:
-            self.downloading_filename = self.files_downloading[0].path.split(
-                os.path.sep)[-1]
+            self.downloading_filename = os.path.basename(
+                self.files_downloading[0].path)
         # pylint: enable=W0201
         self.update_progressbar()
         logger.debug(
@@ -743,8 +745,8 @@
                 (command.share_id, command.node_id)] = command.deflated_size
         # pylint: disable=W0201
         if not self.uploading_filename:
-            self.uploading_filename = self.files_uploading[0].path.split(
-                os.path.sep)[-1]
+            self.uploading_filename = os.path.basename(
+                self.files_uploading[0].path)
         # pylint: enable=W0201
         self.update_progressbar()
         logger.debug(

=== modified file 'ubuntuone/syncdaemon/config.py'
--- ubuntuone/syncdaemon/config.py	2011-11-02 16:51:32 +0000
+++ ubuntuone/syncdaemon/config.py	2011-12-19 20:54:24 +0000
@@ -26,12 +26,13 @@
 from ubuntu_sso.xdg_base_directory import (
     load_config_paths,
     native_path,
-    syncdaemon_path,
     save_config_path,
     xdg_data_home,
     xdg_cache_home,
 )
 
+from ubuntuone.platform import expand_user
+
 # the try/except is to work with older versions of configglue (that
 # had everything that is now configglue.inischema.* as configglue.*).
 # The naming shenanigans are to work around pyflakes being completely
@@ -85,7 +86,8 @@
     Return the path using user home + value.
 
     """
-    result = syncdaemon_path(os.path.expanduser(path_from_unix(value)))
+    path = path_from_unix(value)
+    result = expand_user(path)
     assert isinstance(result, str)
     return result
 

=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2011-11-02 18:14:42 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2011-12-19 20:54:24 +0000
@@ -251,7 +251,6 @@
         """Return the free space for the given volume."""
         return self.main.vm.get_free_space(volume_id)
 
-    @log_call(logger.debug, with_result=False)
     def waiting(self):
         """Return a list of the operations in action queue."""
         waiting = []
@@ -262,7 +261,6 @@
             waiting.append((operation, str(id(cmd)), data))
         return waiting
 
-    @log_call(logger.debug, with_result=False)
     def waiting_metadata(self):
         """Return a list of the operations in the meta-queue.
 
@@ -279,7 +277,6 @@
                 waiting_metadata.append((operation, data))
         return waiting_metadata
 
-    @log_call(logger.debug, with_result=False)
     def waiting_content(self):
         """Return a list of files that are waiting to be up- or downloaded.
 
@@ -1099,7 +1096,6 @@
 
         self.interface.sync_daemon.QuotaExceeded(volume_dict)
 
-    @log_call(logger.debug)
     def handle_SYS_QUEUE_ADDED(self, command):
         """Handle SYS_QUEUE_ADDED.
 
@@ -1117,7 +1113,6 @@
         sanitize_dict(data)
         self.interface.status.RequestQueueAdded(op_name, str(op_id), data)
 
-    @log_call(logger.debug)
     def handle_SYS_QUEUE_REMOVED(self, command):
         """Handle SYS_QUEUE_REMOVED.
 
@@ -1250,17 +1245,17 @@
     @log_call(logger.debug)
     def get_rootdir(self):
         """Return the root dir/mount point."""
-        return self.main.get_rootdir()
+        return self.main.get_rootdir().decode('utf-8')
 
     @log_call(logger.debug)
     def get_sharesdir(self):
         """Return the shares dir/mount point."""
-        return self.main.get_sharesdir()
+        return self.main.get_sharesdir().decode('utf-8')
 
     @log_call(logger.debug)
     def get_sharesdir_link(self):
         """Return the shares dir/mount point."""
-        return self.main.get_sharesdir_link()
+        return self.main.get_sharesdir_link().decode('utf-8')
 
     @log_call(logger.debug)
     def wait_for_nirvana(self, last_event_interval):

=== modified file 'ubuntuone/syncdaemon/vm_helper.py'
--- ubuntuone/syncdaemon/vm_helper.py	2011-08-25 14:38:35 +0000
+++ ubuntuone/syncdaemon/vm_helper.py	2011-12-19 20:54:24 +0000
@@ -21,7 +21,7 @@
 
 import os
 
-
+from ubuntuone.platform import expand_user
 from ubuntuone.platform import (
     is_link,
     make_link,
@@ -78,7 +78,6 @@
             # only create the link if it does not exist
             make_link(source, dest)
             result = True
-
     return result
 
 
@@ -95,7 +94,7 @@
 
     path = path.decode('utf8')
 
-    user_home = os.path.expanduser(u'~')
+    user_home = expand_user('~')
     start_list = os.path.abspath(user_home).split(os.path.sep)
     path_list = os.path.abspath(path).split(os.path.sep)
 
@@ -123,5 +122,5 @@
     assert isinstance(suggested_path, unicode)
     # Unicode boundary! the suggested_path is Unicode in protocol and server,
     # but here we use bytes for paths
-    path = suggested_path.replace(u'/', os.path.sep)
-    return os.path.expanduser(path).encode("utf8")
+    path = suggested_path.replace(u'/', os.path.sep).encode('utf-8')
+    return expand_user(path)

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2011-10-25 02:24:29 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2011-12-19 20:54:24 +0000
@@ -28,6 +28,7 @@
 from itertools import ifilter
 
 from twisted.internet import defer
+from ubuntuone.platform import expand_user
 from ubuntuone.storageprotocol import request
 from ubuntuone.storageprotocol.volumes import (
     ShareVolume,
@@ -119,8 +120,12 @@
 
     # default generation for all volumes without a value in the metadata
     generation = None
+    # transient value used in local rescan during resubscribe. Set it always to
+    # False no matter what is passed to the constructor
+    local_rescanning = False
 
-    def __init__(self, volume_id, node_id, generation=None, subscribed=False):
+    def __init__(self, volume_id, node_id, generation=None, subscribed=False,
+                 local_rescanning=None):
         """Create the volume."""
         # id and node_id should be str or None
         assert isinstance(volume_id, basestring) or volume_id is None
@@ -230,7 +235,7 @@
     @property
     def active(self):
         """Return True if this Share is accepted."""
-        return self.accepted and self.subscribed
+        return self.accepted and self.subscribed and not self.local_rescanning
 
     def __eq__(self, other):
         result = (super(Share, self).__eq__(other) and
@@ -328,7 +333,7 @@
         Return a list of paths that are 'syncdaemon' valid.
 
         """
-        user_home = os.path.expanduser('~')
+        user_home = expand_user('~')
         path_list = get_path_list(self.path)
         common_prefix = os.path.commonprefix([self.path, user_home])
         common_list = get_path_list(common_prefix)
@@ -346,7 +351,7 @@
     @property
     def active(self):
         """Returns True if the UDF is subscribed."""
-        return self.subscribed
+        return self.subscribed and not self.local_rescanning
 
     @classmethod
     def from_udf_volume(cls, udf_volume, path):
@@ -861,13 +866,13 @@
             self._create_share_dir(share)
             self.log.debug('add_share: volume active, temporarly unsubscribe '
                            'to rescan (scan_local? %r).', share.can_write())
-            share.subscribed = False
+            share.local_rescanning = True
             self.shares[share.volume_id] = share
 
             def subscribe(result):
                 """Subscribe the share after the local rescan."""
                 volume = self.get_volume(share.volume_id)
-                volume.subscribed = True
+                volume.local_rescanning = False
                 self.store_volume(volume)
                 return result
 
@@ -1089,7 +1094,7 @@
             if udf.subscribed:
                 self.log.debug('add_udf: volume subscribed, '
                                'temporarly unsubscribe to do local rescan.')
-                udf.subscribed = False
+                udf.local_rescanning = True
                 self.udfs[udf.volume_id] = udf
                 if not path_exists(udf.path):
                     make_dir(udf.path, recursive=True)
@@ -1102,7 +1107,7 @@
 
                     """
                     volume = self.get_volume(udf.volume_id)
-                    volume.subscribed = True
+                    volume.local_rescanning = False
                     self.store_volume(volume)
                     return result
 
@@ -1277,11 +1282,14 @@
 
             """
             volume = self.get_volume(volume_id)
+            volume.local_rescanning = False
+            self.store_volume(volume)
+            return result
+
+        try:
             volume.subscribed = True
+            volume.local_rescanning = True
             self.store_volume(volume)
-            return result
-
-        try:
             d = self._scan_volume(volume, scan_local=volume.can_write())
         except KeyError, e:
             push_error(error="METADATA_DOES_NOT_EXIST")