Merge lp:~dobey/ubuntuone-client/update-from-trunk into lp:ubuntuone-client/stable-3-0

[dobey]

[Facundo Batista]

    - Two small memory improvements, "unblocked cancels" and "better deferred usage in PLT".

[Diego Sarmentero]

    - Fixed: Problem trying to create an udf with unicode username (LP: #921703 ).
    - Fixed: tests are now not modifying the real user home (LP: #915380).

[Natalia Bidart]

    - Skip NotificationTestCase tests (LP: #921574).

[Manuel de la Peña]

    - Adds the possibility to skip the lint checks on windows when passing the /skip-lint parameter to run-tests.bat.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[lp:~dobey/ubuntuone-client/update-from-trunk]

1169. By Facundo Batista on 2012-02-02

[Facundo Batista]

    - Two small memory improvements, "unblocked cancels" and "better deferred usage in PLT".

[Diego Sarmentero]

    - Fixed: Problem trying to create an udf with unicode username (LP: #921703 ).
    - Fixed: tests are now not modifying the real user home (LP: #915380).

[Natalia Bidart]

    - Skip NotificationTestCase tests (LP: #921574).

[Manuel de la Peña]

    - Adds the possibility to skip the lint checks on windows when passing the /skip-lint parameter to run-tests.bat.

=== modified file 'contrib/testing/testcase.py'
--- contrib/testing/testcase.py	2011-12-29 14:44:10 +0000
+++ contrib/testing/testcase.py	2012-02-01 20:50:24 +0000
@@ -48,6 +48,7 @@
     tritcask,
 )
 from ubuntuone.syncdaemon import logger
+from ubuntuone import platform
 from ubuntuone.platform import (
     can_write,
     make_dir,
@@ -377,6 +378,9 @@
         self.log = logging.getLogger("ubuntuone.SyncDaemon.TEST")
         self.log.info("starting test %s.%s", self.__class__.__name__,
                       self._testMethodName)
+        # Patch the user home
+        self.home_dir = self.mktemp('ubuntuonehacker')
+        self.patch(platform, "xdg_home", self.home_dir)
 
 
 class FakeMainTestCase(BaseTwistedTestCase):
@@ -389,11 +393,6 @@
         """Setup the infrastructure for the test."""
         yield super(FakeMainTestCase, self).setUp()
 
-        self.home_dir = self.tmpdir
-        old_home = os.environ['HOME']
-        os.environ['HOME'] = self.home_dir
-        self.addCleanup(os.environ.__setitem__, 'HOME', old_home)
-
         self.data_dir = self.mktemp('data_dir')
         self.partials_dir = self.mktemp('partials')
         self.root_dir = self.mktemp('root_dir')

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-01-12 13:06:51 +0000
+++ run-tests.bat	2012-02-01 20:50:24 +0000
@@ -1,6 +1,4 @@
-:: Author: Manuel de la Pena <[e-mail]>
-::
-:: Copyright 2010 Canonical Ltd.
+:: Copyright 2010-12 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
@@ -13,53 +11,104 @@
 ::
 :: You should have received a copy of the GNU General Public License along
 :: with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 @ECHO off
+
 :: We could have Python 2.6 or 2.7 on Windows. In order to check availability,
 :: we should first check for 2.7, and run the tests, otherwise fall back to 2.6.
+SET REGQUERY27="REG QUERY HKLM\Software\Python\PythonCore\2.7\InstallPath /ve"
+SET REGQUERY2732="REG QUERY HKLM\Software\Wow6432Node\Python\PythonCore\2.7\InstallPath /ve"
+SET REGQUERY26="REG QUERY HKLM\Software\Python\PythonCore\2.6\InstallPath /ve"
+SET REGQUERY2632="REG QUERY HKLM\Software\Wow6432Node\Python\PythonCore\2.6\InstallPath /ve"
 SET PYTHONEXEPATH=""
+
 :: This is very annoying; FOR /F will work differently depending on the output
 :: of reg which is not consistent between OS versions (XP, 7). We must choose
 :: the tokens according to OS version.
 SET PYTHONPATHTOKENS=3
 VER | FIND "XP" > nul
-IF %ERRORLEVEL% == 0 SET PYTHONPATHTOKENS=4
+IF %ERRORLEVEL% == 0 (
+    SET PYTHONPATHTOKENS=4)
+
 ECHO Checking if python 2.7 is in the system
+
 :: Look for python 2.7
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('REG QUERY HKLM\Software\Python\PythonCore\2.7\InstallPath /ve') DO @SET PYTHONEXEPATH=%%A
-IF NOT %PYTHONEXEPATH% == "" GOTO :PYTHONPRESENT
+FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY27%') DO @SET PYTHONEXEPATH=%%A
+
+IF NOT %PYTHONEXEPATH% == "" (
+    GOTO :PYTHONPRESENT)
+
 ECHO Checking if python 2.6 is in the system
 :: we do not have python 2.7 in the system, try to find 2.6
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('REG QUERY HKLM\Software\Python\PythonCore\2.6\InstallPath /ve') DO @SET PYTHONEXEPATH=%%A
-IF NOT %PYTHONEXEPATH% == "" GOTO :PYTHONPRESENT
+FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY26%') DO @SET PYTHONEXEPATH=%%A
+
+IF NOT %PYTHONEXEPATH% == "" (
+    GOTO :PYTHONPRESENT)
 
 :: we do not have python (2.6 or 2.7) this could hapen in the case  that the
 :: user installed the 32version in a 64 machine, let check if the software was installed in the wow key
 
 :: Look for python 2.7 in WoW64
 ECHO Checking if python 2.7 32 is in the system
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('REG QUERY HKLM\Software\Wow6432Node\Python\PythonCore\2.7\InstallPath /ve') DO @SET PYTHONEXEPATH=%%A
-IF NOT %PYTHONEXEPATH% == "" GOTO :PYTHONPRESENT
+FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY2732%') DO @SET PYTHONEXEPATH=%%A
+
+IF NOT %PYTHONEXEPATH% == "" (
+    GOTO :PYTHONPRESENT)
+
 ECHO Checking if python 2.6 32 is in the system
 :: we do not have python 2.7 in the system, try to find 2.6
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('REG QUERY HKLM\Software\Wow6432Node\Python\PythonCore\2.6\InstallPath /ve') DO @SET PYTHONEXEPATH=%%A
-IF NOT %PYTHONEXEPATH% == "" GOTO :PYTHONPRESENT
+FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY2632%') DO @SET PYTHONEXEPATH=%%A
+
+IF NOT %PYTHONEXEPATH% == "" (
+    GOTO :PYTHONPRESENT)
 
 ECHO Please ensure you have python installed
 GOTO :END
 
 
 :PYTHONPRESENT
+
+:: throw the first parameter away if is /skip-lint,
+:: the way we do this is to ensure that /skip-lint
+:: is the first parameter and copy all the rest in a loop
+:: the main reason for that is that %* is not affected
+:: by SHIFT, that is, it allways have all passed parameters
+
+SET PARAMS=%*
+SET SKIPLINT=0
+IF "%1" == "/skip-lint" (
+    SET SKIPLINT=1
+    GOTO :CLEANPARAMS
+)ELSE (
+    GOTO :CONTINUEBATCH) 
+:CLEANPARAMS
+
+SHIFT
+SET PARAMS=%1
+:GETREST
+SHIFT
+if [%1]==[] (
+    GOTO CONTINUEBATCH)
+SET PARAMS=%PARAMS% %1
+GOTO GETREST
+:CONTINUEBATCH
+
 ECHO Python found, executing the tests...
 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 -p tests\platform\linux %* tests
+"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" --reactor=twisted -c -p tests\platform\linux %PARAMS% tests
+
+IF %SKIPLINT% == 1 (
+    ECHO Skipping style checks
+    GOTO :CLEAN)
 "%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"
-"%PYTHONEXEPATH%\Scripts\pep8.exe" --repeat ubuntuone
-ELSE
-ECHO Style checks were not done
+IF EXIST "%PYTHONEXEPATH%\Scripts\pep8.exe" (
+    "%PYTHONEXEPATH%\Scripts\pep8.exe" --repeat ubuntuone
+)ELSE (
+    ECHO Style checks were not done)
+:CLEAN
 :: Delete the temp folders
 RMDIR /s /q _trial_temp
 RMDIR /s /q .coverage

=== modified file 'tests/platform/linux/eventlog/test_zg_listener.py'
--- tests/platform/linux/eventlog/test_zg_listener.py	2011-11-09 20:03:15 +0000
+++ tests/platform/linux/eventlog/test_zg_listener.py	2012-02-01 20:50:24 +0000
@@ -368,20 +368,6 @@
 class ZeitgeistUDFsTestCase(ZeitgeistListenerTestCase):
     """Tests for all UDFs-related zeitgeist events."""
 
-    @defer.inlineCallbacks
-    def setUp(self):
-        """Initialize this test instance."""
-        yield super(ZeitgeistUDFsTestCase, self).setUp()
-        self.home_dir = self.mktemp('ubuntuonehacker')
-        self._old_home = os.environ['HOME']
-        os.environ['HOME'] = self.home_dir
-
-    @defer.inlineCallbacks
-    def tearDown(self):
-        """Finalize this test instance."""
-        os.environ['HOME'] = self._old_home
-        yield super(ZeitgeistUDFsTestCase, self).tearDown()
-
     def _create_udf(self, id, node_id, suggested_path, subscribed=True):
         """Create an UDF and returns it and the volume."""
         path = get_udf_path(suggested_path)

=== modified file 'tests/platform/linux/test_filesystem_notifications.py'
--- tests/platform/linux/test_filesystem_notifications.py	2011-09-02 16:09:41 +0000
+++ tests/platform/linux/test_filesystem_notifications.py	2012-02-01 20:50:24 +0000
@@ -99,7 +99,6 @@
         fsmdir = self.mktemp('fsmdir')
         partials_dir = self.mktemp('partials_dir')
         self.root_dir = self.mktemp('root_dir')
-        self.home_dir = self.mktemp('home_dir')
         self.vm = testcase.FakeVolumeManager(self.root_dir)
         self.tritcask_dir = self.mktemp("tritcask_dir")
         self.db = Tritcask(self.tritcask_dir)

=== modified file 'tests/platform/linux/test_notification.py'
--- tests/platform/linux/test_notification.py	2011-10-27 11:39:43 +0000
+++ tests/platform/linux/test_notification.py	2012-02-01 20:50:24 +0000
@@ -112,3 +112,7 @@
         notifier = Notification(FAKE_APP_NAME)
         notifier.send_notification(FAKE_TITLE, FAKE_MESSAGE, append=True)
         notifier.send_notification(FAKE_TITLE, FAKE_APPENDAGE, append=True)
+
+
+NotificationTestCase.skip = "Not working when the GI Notify module is used " \
+"(LP: #921574)."

=== modified file 'tests/platform/linux/test_vm.py'
--- tests/platform/linux/test_vm.py	2011-11-17 19:19:08 +0000
+++ tests/platform/linux/test_vm.py	2012-02-01 20:50:24 +0000
@@ -459,9 +459,11 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(MetadataNewLayoutTests, self).setUp()
-        self.share_md_dir = os.path.join(self.vm_data_dir, 'shares')
-        self.shared_md_dir = os.path.join(self.vm_data_dir, 'shared')
+        # We need to define home_dir here to add 'home' to the path
+        # and avoid crashes between existing paths.
         self.home_dir = os.path.join(self.tmpdir, 'home', 'ubuntuonehacker')
+        self.share_md_dir = os.path.join(self.vm_data_dir, 'shares')
+        self.shared_md_dir = os.path.join(self.vm_data_dir, 'shared')
         self.u1_dir = os.path.join(self.home_dir, os.path.split(self.u1_dir)[1])
         self.root_dir = self.u1_dir
         self.shares_dir = os.path.join(self.tmpdir, 'shares')

=== modified file 'tests/platform/test_filesystem_notifications.py'
--- tests/platform/test_filesystem_notifications.py	2011-10-21 13:40:09 +0000
+++ tests/platform/test_filesystem_notifications.py	2012-02-01 20:50:24 +0000
@@ -99,7 +99,6 @@
         fsmdir = self.mktemp('fsmdir')
         partials_dir = self.mktemp('partials_dir')
         self.root_dir = self.mktemp('root_dir')
-        self.home_dir = self.mktemp('home_dir')
         self.vm = FakeVolumeManager(self.root_dir)
         self.tritcask_dir = self.mktemp("tritcask_dir")
         self.db = Tritcask(self.tritcask_dir)

=== modified file 'tests/platform/test_os_helper.py'
--- tests/platform/test_os_helper.py	2012-01-12 14:01:38 +0000
+++ tests/platform/test_os_helper.py	2012-02-01 20:50:24 +0000
@@ -28,7 +28,6 @@
     BaseTwistedTestCase,
     skip_if_win32_and_uses_readonly,
 )
-from ubuntuone import platform
 from ubuntuone.platform import (
     access,
     allow_writes,
@@ -91,8 +90,6 @@
         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()
 
@@ -395,21 +392,21 @@
         """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')
+        expected = os.path.join(self.home_dir, '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
+        expected = self.home_dir + 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.assertEqual(self.home_dir, result)
         self.assertFalse(result.endswith(os.path.sep))
 
     def test_expand_user_fails_if_not_bytes(self):

=== modified file 'tests/platform/test_tools.py'
--- tests/platform/test_tools.py	2012-01-11 21:40:51 +0000
+++ tests/platform/test_tools.py	2012-02-01 20:50:24 +0000
@@ -31,7 +31,6 @@
     states,
     volume_manager,
 )
-from ubuntuone import platform
 from ubuntuone.platform import tools
 from tests.platform import IPCTestCase
 
@@ -533,7 +532,6 @@
     @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'
@@ -552,7 +550,6 @@
     @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/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2011-12-20 10:58:38 +0000
+++ tests/syncdaemon/test_action_queue.py	2012-02-01 20:50:24 +0000
@@ -219,8 +219,8 @@
         """Init."""
         yield super(BasicTestCase, self).setUp()
 
+        self.home = self.home_dir
         self.root = self.mktemp('root')
-        self.home = self.mktemp('home')
         self.data = self.mktemp('data')
         self.shares = self.mktemp('shares')
         self.partials = self.mktemp('partials')
@@ -1744,11 +1744,11 @@
         called = []
         self.cmd.run = lambda: called.append(True)
         d = defer.Deferred()
+        d.addErrback(lambda _: None)
         self.cmd._acquire_pathlock = lambda: d
 
         self.cmd.go()
         self.cmd.cancel()
-        d.callback(None)
 
         self.assertFalse(called)
 
@@ -1757,15 +1757,15 @@
         called = []
         self.cmd.run = lambda: called.append(1)
         d = defer.Deferred()
+        d.addErrback(lambda _: called.append(2))
         self.cmd._acquire_pathlock = lambda: d
 
         self.cmd.go()
         self.cmd.cancel()
-        d.callback(lambda: called.append(2))
 
         self.assertEqual(called, [2])
         self.assertTrue(self.handler.check_debug(
-                        'releasing the pathlock because of cancelled'))
+                        'command not run because of cancelled'))
 
     def test_go_run_ok_release_pathlock(self):
         """If run went ok, release the pathlock."""
@@ -2532,18 +2532,6 @@
         """Init."""
         yield super(FilterEventsTestCase, self).setUp()
         self.vm = self.main.vm
-        self.old_home = os.environ.get('HOME', None)
-        os.environ['HOME'] = self.home
-
-    @defer.inlineCallbacks
-    def tearDown(self):
-        """Clean up."""
-        if self.old_home is None:
-            os.environ.pop('HOME')
-        else:
-            os.environ['HOME'] = self.old_home
-
-        yield super(FilterEventsTestCase, self).tearDown()
 
 
 class ChangePublicAccessTests(ConnectedBaseTestCase):
@@ -5409,22 +5397,20 @@
         self._check_finished_ok()
 
     def test_cancel_while_pathclocked(self):
-        """Cancel the command while running."""
+        """Cancel the command while pathlocked."""
         # monkeypatch _run to flag called and test "while running"
         called = []
         self.cmd.run = lambda: called.append('should not')
 
         # monkeypatch to test "while waiting pathlock"
         d = defer.Deferred()
+        d.addErrback(lambda _: called.append(1))
         self.cmd._acquire_pathlock = lambda: d
 
         # let the command go, and cancel in the middle
         self.cmd.go()
         self.cmd.cancel()
 
-        # unlock the pathlock
-        d.callback(lambda: called.append(1))
-
         # all check
         self.assertEqual(called, [1])
         self._check_finished_ok()

=== modified file 'tests/syncdaemon/test_eq_inotify.py'
--- tests/syncdaemon/test_eq_inotify.py	2011-11-30 19:54:45 +0000
+++ tests/syncdaemon/test_eq_inotify.py	2012-02-01 20:50:24 +0000
@@ -34,7 +34,6 @@
     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,
@@ -646,7 +645,6 @@
         """Init."""
         yield super(AncestorsUDFTestCase, self).setUp()
         self._deferred = defer.Deferred()
-        self.home_dir = self.mktemp('ubuntuonehacker')
         self.root_dir = self.mktemp('root_dir')
         self.data_dir = self.mktemp('data_dir')
         self.shares_dir = self.mktemp('shares_dir')
@@ -661,8 +659,6 @@
         self.eq.subscribe(self.listener)
         self.addCleanup(self.eq.unsubscribe, self.listener)
 
-        self.patch(platform, 'xdg_home', self.home_dir)
-
         # create UDF
         suggested_path = u'~/Documents/Reading/Books/PDFs'
         udf_id, node_id = 'udf_id', 'node_id'

=== modified file 'tests/syncdaemon/test_eventqueue.py'
--- tests/syncdaemon/test_eventqueue.py	2011-08-17 13:11:06 +0000
+++ tests/syncdaemon/test_eventqueue.py	2012-02-01 20:50:24 +0000
@@ -43,7 +43,6 @@
         self.fsmdir = self.mktemp('fsmdir')
         self.partials_dir = self.mktemp('partials_dir')
         self.root_dir = self.mktemp('root_dir')
-        self.home_dir = self.mktemp('home_dir')
         self.vm = FakeVolumeManager(self.root_dir)
         self.db = tritcask.Tritcask(self.mktemp('tritcask'))
         self.addCleanup(self.db.shutdown)

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2011-11-30 19:54:45 +0000
+++ tests/syncdaemon/test_localrescan.py	2012-02-01 20:50:24 +0000
@@ -33,7 +33,6 @@
     FakeVolumeManager,
     skip_if_win32_and_uses_readonly,
 )
-from ubuntuone import platform
 from ubuntuone.platform import (
     make_dir,
     make_link,
@@ -123,16 +122,12 @@
     def setUp(self):
         """ Setup the test """
         yield super(BaseTestCase, self).setUp()
-        self.home_dir = self.mktemp('ubuntuonehacker')
         self.shares_dir = self.mktemp('shares')
         usrdir = self.mktemp("usrdir")
         self.fsmdir = self.mktemp("fsmdir")
         self.partials_dir = self.mktemp("partials")
         self.tritcask_dir = self.mktemp("tritcask")
 
-        # set the home for the tests
-        self.patch(platform, 'xdg_home', self.home_dir)
-
         self.vm = FakeVolumeManager(usrdir)
         self.db = Tritcask(self.tritcask_dir)
         self.addCleanup(self.db.shutdown)
@@ -371,8 +366,6 @@
         """Init."""
         yield super(VolumeTestCase, self).setUp()
 
-        self.patch(platform, 'xdg_home', self.home_dir)
-
         self.lr = local_rescan.LocalRescan(self.vm, self.fsm, self.eq, self.aq)
 
         self.volumes = []
@@ -2016,11 +2009,6 @@
     """Test what happens with volume roots left in a bad state last time."""
 
     @defer.inlineCallbacks
-    def setUp(self):
-        yield super(RootBadStateTests, self).setUp()
-        self.patch(platform, 'xdg_home', self.home_dir)
-
-    @defer.inlineCallbacks
     def _test_it(self, volume):
         """Run the bad state test for a specific volume."""
         path = volume.path
@@ -2257,8 +2245,6 @@
 
         self.lr = local_rescan.LocalRescan(self.vm, self.fsm, self.eq, self.aq)
 
-        self.patch(platform, 'xdg_home', self.home_dir)
-
         # create UDF
         suggested_path = u'~/Documents/Reading/Books/PDFs'
         udf_id, node_id = 'udf_id', 'node_id'

=== modified file 'tests/syncdaemon/test_main.py'
--- tests/syncdaemon/test_main.py	2012-01-03 12:40:04 +0000
+++ tests/syncdaemon/test_main.py	2012-02-01 20:50:24 +0000
@@ -264,6 +264,7 @@
 
     def test_get_homedir(self):
         """The get_homedir returns the root dir."""
+        self.patch(main_mod, "xdg_home", self.home_dir)
         expected = expand_user('~')
         main = self.build_main()
         self.assertEqual(main.get_homedir(), expected)

=== modified file 'tests/syncdaemon/test_pathlockingtree.py'
--- tests/syncdaemon/test_pathlockingtree.py	2011-10-27 11:39:43 +0000
+++ tests/syncdaemon/test_pathlockingtree.py	2012-02-01 20:50:24 +0000
@@ -260,6 +260,21 @@
         releases.pop(0)()
         yield d3
 
+    def test_deferred_can_be_cancelled(self):
+        """The path locking can be cancelled without harm."""
+        releases = []
+        d1 = self.plt.acquire("path")
+        d1.addCallback(lambda _: releases.append(1))
+        d2 = self.plt.acquire("path")
+        d2.addCallback(lambda _: releases.append(2))
+
+        # the first one should not be locked
+        self.assertEqual(releases, [1])
+
+        # cancel the second deferred, but it still needs to pass ok
+        d2.cancel()
+        self.assertEqual(releases, [1, 2])
+
     @defer.inlineCallbacks
     def test_same_path_having_parent(self):
         """Lock with parent having just the parent."""
@@ -560,7 +575,10 @@
         self.plt = PathLockingTree()
 
         self.handler = MementoHandler()
+        self.plt.logger.setLevel(logging.DEBUG)
+        self.plt.logger.propagate = False
         self.plt.logger.addHandler(self.handler)
+        self.addCleanup(self.plt.logger.removeHandler, self.handler)
 
     @defer.inlineCallbacks
     def test_logger_can_be_given(self):
@@ -568,6 +586,8 @@
         logger = logging.getLogger("ubuntuone.SyncDaemon.Test")
         handler = MementoHandler()
         logger.addHandler(handler)
+        logger.setLevel(logging.DEBUG)
+        logger.propagate = False
 
         # acquire and test
         release = yield self.plt.acquire('path', logger=logger)

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2011-12-12 19:32:25 +0000
+++ tests/syncdaemon/test_vm.py	2012-02-01 20:50:24 +0000
@@ -91,14 +91,12 @@
         self.log = logging.getLogger("ubuntuone.SyncDaemon.TEST")
         self.log.info("starting test %s.%s", self.__class__.__name__,
                       self._testMethodName)
-        self.home_dir = self.mktemp('ubuntuonehacker')
         self.root_dir = self.mktemp(os.path.join('ubuntuonehacker', 'root_dir'))
         self.data_dir = self.mktemp('data_dir')
         self.shares_dir = self.mktemp('shares_dir')
         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
 
@@ -124,10 +122,6 @@
         self.vm.log.addHandler(self.handler)
         self.addCleanup(self.vm.log.removeHandler, self.handler)
 
-        old_home = os.environ['HOME']
-        os.environ['HOME'] = self.home_dir
-        self.addCleanup(os.environ.__setitem__, 'HOME', old_home)
-
     @defer.inlineCallbacks
     def tearDown(self):
         """ cleanup main and remove the temp dir """
@@ -3742,7 +3736,6 @@
     def setUp(self):
         """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.data_dir = os.path.join(self.tmpdir, 'data_dir')

=== modified file 'tests/syncdaemon/test_vm_helper.py'
--- tests/syncdaemon/test_vm_helper.py	2012-01-04 13:18:50 +0000
+++ tests/syncdaemon/test_vm_helper.py	2012-02-01 20:50:24 +0000
@@ -66,6 +66,21 @@
         in_home = os.path.join(self.home_dir, 'foo')
         self.assertEqual(u'~/foo', get_udf_suggested_path(in_home))
 
+    def test_get_udf_suggested_path_expand_user_decode(self):
+        """Test for get_udf_suggested_path."""
+        home = os.path.join(self.home_dir.decode('utf-8'),
+            u'雄鳥お人好し ñandú')
+
+        def fake_expand_user(path):
+            """Fake expand_user."""
+            return home.encode('utf-8')
+
+        self.patch(vm_helper, 'expand_user', fake_expand_user)
+        in_home = os.path.join(home, u'ñoño')
+        in_home = in_home.encode('utf-8')
+        suggested_path = get_udf_suggested_path(in_home)
+        self.assertEqual(u'~/ñoño', suggested_path)
+
     def test_get_udf_suggested_path_long_path(self):
         """Test for get_udf_suggested_path."""
         deep_in_home = os.path.join(self.home_dir, 'docs', 'foo', 'bar')

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2011-12-08 20:56:10 +0000
+++ ubuntuone/platform/__init__.py	2012-02-01 20:50:24 +0000
@@ -37,7 +37,6 @@
 
 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')

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2011-12-19 17:10:39 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2012-02-01 20:50:24 +0000
@@ -161,9 +161,18 @@
         logger.debug("pathlock acquiring on %s (on_parent=%s, on_children=%s);"
                      " wait for: %d", elements, on_parent,
                      on_children, len(wait_for))
+
+        relfunc = partial(self._release, deferred, elements, logger)
+        if not wait_for:
+            return defer.succeed(relfunc)
+        if len(wait_for) == 1:
+            d = defer.Deferred()
+            wait_for[0].chainDeferred(d)
+            d.addBoth(lambda _: relfunc)
+            return d
+        # we need to wait for several
         deferred_list = defer.DeferredList(wait_for)
-        deferred_list.addCallback(lambda _: partial(self._release, deferred,
-                                                    elements, logger))
+        deferred_list.addBoth(lambda _: relfunc)
         return deferred_list
 
     def _release(self, deferred, elements, logger):
@@ -357,18 +366,6 @@
         LoggingStorageClient.connectionLost(self, reason)
 
 
-class Marker(str):
-    """A uuid4-based marker class."""
-
-    implements(IMarker)
-
-    def __new__(cls):
-        return super(Marker, cls).__new__(cls, uuid.uuid4())
-
-    def __repr__(self):
-        return "marker:%s" % self
-
-
 class ZipQueue(object):
     """A queue of files to be compressed for upload.
 
@@ -1175,9 +1172,9 @@
     is_runnable = True
     uniqueness = None
 
-    __slots__ = ('_queue', 'running', 'pathlock_release', 'log',
+    __slots__ = ('_queue', 'running', 'pathlock_release', 'pathlock_deferred',
                  'markers_resolved_deferred', 'action_queue', 'cancelled',
-                 'running_deferred')
+                 'running_deferred', 'log')
 
     def __init__(self, request_queue):
         """Initialize a command instance."""
@@ -1187,6 +1184,7 @@
         self.log = None
         self.markers_resolved_deferred = defer.Deferred()
         self.pathlock_release = None
+        self.pathlock_deferred = None
         self.cancelled = False
         self.running_deferred = None
 
@@ -1296,11 +1294,13 @@
 
         # acquire the pathlock; note that the pathlock_release may be None
         # if the command didn't need to acquire any pathlock
-        self.pathlock_release = yield self._acquire_pathlock()
+        self.pathlock_deferred = self._acquire_pathlock()
+        self.pathlock_release = yield self.pathlock_deferred
+        self.pathlock_deferred = None
         if self.cancelled:
+            self.log.debug('command not run because of cancelled')
             if self.pathlock_release is not None:
-                self.log.debug('releasing the pathlock because of cancelled')
-                self.pathlock_release()
+                self.pathlock_release = self.pathlock_release()
             return
 
         try:
@@ -1310,7 +1310,7 @@
                                "(traceback follows)", exc)
         finally:
             if self.pathlock_release is not None:
-                self.pathlock_release()
+                self.pathlock_release = self.pathlock_release()
 
     @defer.inlineCallbacks
     def run(self):
@@ -1394,6 +1394,8 @@
         self.cancelled = True
         self.log.debug('cancelled')
         self.action_queue.conditions_locker.cancel_command(self)
+        if self.pathlock_deferred is not None:
+            self.pathlock_deferred.cancel()
         self.cleanup()
         self.finish()
         return True

=== modified file 'ubuntuone/syncdaemon/vm_helper.py'
--- ubuntuone/syncdaemon/vm_helper.py	2011-11-17 18:38:41 +0000
+++ ubuntuone/syncdaemon/vm_helper.py	2012-02-01 20:50:24 +0000
@@ -89,12 +89,11 @@
     """
     if not path:
         raise ValueError("no path specified")
-
     assert isinstance(path, str)
 
     path = path.decode('utf8')
 
-    user_home = expand_user('~')
+    user_home = expand_user('~').decode('utf-8')
     start_list = os.path.abspath(user_home).split(os.path.sep)
     path_list = os.path.abspath(path).split(os.path.sep)