Merge lp:~nataliabidart/ubuntuone-client/no-more-oses into lp:ubuntuone-client

[Natalia Bidart]

- Removed most of the calls to: os.rename, os.chmod, os.path.exists, os.remove and os.rmdir (LP: #823261).

[lp:~nataliabidart/ubuntuone-client/no-more-oses]

1099. By Natalia Bidart on 2011-08-09

Changes from dependency branch.

[Alejandro J. Cura (alecu)]

Great branch

review: Approve

=== modified file 'tests/platform/test_filesystem_notifications.py'
--- tests/platform/test_filesystem_notifications.py	2011-06-24 19:48:00 +0000
+++ tests/platform/test_filesystem_notifications.py	2011-08-09 16:37:30 +0000
@@ -23,12 +23,13 @@
 import unittest
 
 from twisted.internet import defer, reactor
+from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.devtools.testcase import skipIfOS
 
 from tests.platform import _GeneralINotifyProcessor
 from contrib.testing import testcase
+from ubuntuone.platform import remove_file, remove_dir, rename
 from ubuntuone.syncdaemon.tritcask import Tritcask
-from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.devtools.testcase import skipIfOS
 from ubuntuone.syncdaemon import (
     event_queue,
     filesystem_manager,
@@ -315,7 +316,7 @@
         yield self.monitor.add_watch(self.root_dir)
 
         # generate the event
-        os.remove(testfile)
+        remove_file(testfile)
         reactor.callLater(self.timeout - 0.2, self.check_filter)
         test_result = yield self._deferred
         defer.returnValue(test_result)
@@ -330,7 +331,7 @@
         yield self.monitor.add_watch(self.root_dir)
 
         # generate the event
-        os.rmdir(testdir)
+        remove_dir(testdir)
         reactor.callLater(self.timeout - 0.2, self.check_filter)
         test_result = yield self._deferred
         defer.returnValue(test_result)
@@ -351,7 +352,7 @@
         yield self.monitor.add_watch(self.root_dir)
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         reactor.callLater(self.timeout - 0.2, self.check_filter)
         test_result = yield self._deferred
         defer.returnValue(test_result)
@@ -372,7 +373,7 @@
         yield self.monitor.add_watch(self.root_dir)
 
         # generate the event
-        os.rename(fromdir, todir)
+        rename(fromdir, todir)
         reactor.callLater(self.timeout - 0.2, self.check_filter)
         test_result = yield self._deferred
         defer.returnValue(test_result)
@@ -393,7 +394,7 @@
         yield self.monitor.add_watch(self.root_dir)
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         reactor.callLater(self.timeout - 0.2, self.check_filter)
         test_result = yield self._deferred
         defer.returnValue(test_result)
@@ -412,7 +413,7 @@
         yield self.monitor.add_watch(root_dir)
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         reactor.callLater(self.timeout - 0.2, self.check_filter)
         test_result = yield self._deferred
         defer.returnValue(test_result)
 
=== modified file 'tests/platform/test_os_helper.py'
--- tests/platform/test_os_helper.py	2011-08-09 16:37:30 +0000
+++ tests/platform/test_os_helper.py	2011-08-09 16:37:30 +0000
@@ -84,7 +84,7 @@
         set_dir_readwrite(self.basedir)
         foo_dir = os.path.join(self.basedir, 'foo')
         os.mkdir(foo_dir)
-        self.assertTrue(os.path.exists(foo_dir))
+        self.assertTrue(path_exists(foo_dir))
 
     def test_allow_writes(self):
         """Test for allow_writes."""
@@ -92,7 +92,7 @@
         with allow_writes(self.basedir):
             foo_dir = os.path.join(self.basedir, 'foo')
             os.mkdir(foo_dir)
-            self.assertTrue(os.path.exists(foo_dir))
+            self.assertTrue(path_exists(foo_dir))
 
     def test_set_file_readonly(self):
         """Test for set_file_readonly."""
@@ -135,16 +135,16 @@
         """Test the remove dir."""
         testdir = os.path.join(self.basedir, 'foodir')
         os.mkdir(testdir)
-        assert os.path.exists(testdir)
+        assert path_exists(testdir)
         remove_dir(testdir)
         self.assertFalse(path_exists(testdir))
 
     def test_make_dir_one(self):
         """Test the make dir with one dir."""
         testdir = os.path.join(self.basedir, 'foodir')
-        assert not os.path.exists(testdir)
+        assert not path_exists(testdir)
         make_dir(testdir)
-        self.assertTrue(os.path.exists(testdir))
+        self.assertTrue(path_exists(testdir))
 
     def test_make_dir_already_there(self):
         """Test the make dir with one dir that exists."""
@@ -153,15 +153,15 @@
     def test_make_dir_recursive_no(self):
         """Test the make dir with some dirs, not recursive explicit."""
         testdir = os.path.join(self.basedir, 'foo', 'bar')
-        assert not os.path.exists(testdir)
+        assert not path_exists(testdir)
         self.assertRaises(OSError, make_dir, testdir)
 
     def test_make_dir_recursive_yes(self):
         """Test the make dir with some dirs, recursive."""
         testdir = os.path.join(self.basedir, 'foo', 'bar')
-        assert not os.path.exists(testdir)
+        assert not path_exists(testdir)
         make_dir(testdir, recursive=True)
-        self.assertTrue(os.path.exists(testdir))
+        self.assertTrue(path_exists(testdir))
 
     def test_open_file_not_there(self):
         """Open a file that does not exist."""
 
=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2011-08-08 19:54:46 +0000
+++ tests/syncdaemon/test_action_queue.py	2011-08-09 16:37:30 +0000
@@ -31,9 +31,9 @@
 import uuid
 
 from functools import wraps
+from StringIO import StringIO
 
 from mocker import Mocker, MockerTestCase, ANY, expect
-from StringIO import StringIO
 from oauth import oauth
 from twisted.internet import defer, threads, reactor
 from twisted.internet import error as twisted_error
@@ -47,7 +47,7 @@
 )
 from ubuntuone.devtools import handlers
 from ubuntuone import logger, clientdefs
-from ubuntuone.platform import platform
+from ubuntuone.platform import platform, path_exists
 from ubuntuone.storageprotocol import (
     client,
     content_hash,
@@ -3316,12 +3316,12 @@
         self.command.tempfile = TempFile()
         self.command.tempfile.name = os.path.join(self.tmpdir, 'remove-me.zip')
         open(self.command.tempfile.name, 'w').close()
-        assert os.path.exists(self.command.tempfile.name)
+        assert path_exists(self.command.tempfile.name)
 
         msg = 'Something went wrong'
         failure = Failure(DefaultException(msg))
         self.command.handle_failure(failure=failure)
-        self.assertFalse(os.path.exists(self.command.tempfile.name))
+        self.assertFalse(path_exists(self.command.tempfile.name))
 
     def test_retryable_failure_push_quota_exceeded_if_that_error(self):
         """Test SYS_QUOTA_EXCEEDED is pushed on QuotaExceededError."""
 
=== modified file 'tests/syncdaemon/test_config.py'
--- tests/syncdaemon/test_config.py	2011-07-29 12:51:04 +0000
+++ tests/syncdaemon/test_config.py	2011-08-09 16:37:30 +0000
@@ -23,6 +23,7 @@
 from ConfigParser import ConfigParser
 from twisted.internet import defer
 
+from ubuntuone.platform import path_exists
 from ubuntuone.platform.xdg_base_directory import (
     xdg_data_home,
     xdg_cache_home,
@@ -103,7 +104,7 @@
     def test_write_new(self):
         """test writing the throttling section to a new config file"""
         conf_file = os.path.join(self.test_root, 'test_write_new_config.conf')
-        self.assertFalse(os.path.exists(conf_file))
+        self.assertFalse(path_exists(conf_file))
         conf = config._Config(conf_file)
         conf.set_throttling(True)
         conf.set_throttling_read_limit(1000)
@@ -124,7 +125,7 @@
             fp.write('on = False\n')
             fp.write('read_limit = 1000\n')
             fp.write('write_limit = 100\n')
-        self.assertTrue(os.path.exists(conf_file))
+        self.assertTrue(path_exists(conf_file))
         conf = config._Config(conf_file)
         conf.set_throttling(True)
         conf.set_throttling_read_limit(2000)
@@ -150,7 +151,7 @@
             fp.write('on = False\n')
             fp.write('read_limit = 2000\n')
             fp.write('write_limit = 200\n')
-        self.assertTrue(os.path.exists(conf_file))
+        self.assertTrue(path_exists(conf_file))
         conf = config._Config(conf_file)
         conf.set_throttling(True)
         conf.set_throttling_read_limit(3000)
@@ -177,7 +178,7 @@
             fp.write('on = True\n')
             fp.write('read_limit = 1000\n')
             fp.write('write_limit = 100\n')
-        self.assertTrue(os.path.exists(conf_file))
+        self.assertTrue(path_exists(conf_file))
         conf = config._Config(conf_file)
         conf.set_throttling(False)
         conf.save()
@@ -570,7 +571,7 @@
         with open(conf_file, 'w') as fp:
             fp.write('[__main__]\n')
             fp.write('log_level = DEBUG\n')
-        self.assertTrue(os.path.exists(conf_file))
+        self.assertTrue(path_exists(conf_file))
         self.cp.read([conf_file])
         self.cp.parse_all()
         self.assertEquals(self.cp.get('logging', 'level').value, 10)
@@ -582,7 +583,7 @@
         with open(conf_file, 'w') as fp:
             fp.write('[logging]\n')
             fp.write('level = DEBUG\n')
-        self.assertTrue(os.path.exists(conf_file))
+        self.assertTrue(path_exists(conf_file))
         self.cp.read([conf_file])
         self.cp.parse_all()
         self.assertEquals(self.cp.get('logging', 'level').value, 10)
@@ -597,7 +598,7 @@
             fp.write('log_level = NOTE\n')
             fp.write('[logging]\n')
             fp.write('level = ERROR\n')
-        self.assertTrue(os.path.exists(conf_file))
+        self.assertTrue(path_exists(conf_file))
         self.cp.read([conf_file])
         self.cp.parse_all()
         self.assertEquals(self.cp.get('logging', 'level').value, logging.ERROR)
@@ -634,7 +635,7 @@
         with open(conf_file, 'w') as fp:
             fp.write('[__main__]\n')
             fp.write('ignore = .*\\.pyc\n')  # all .pyc files
-        self.assertTrue(os.path.exists(conf_file))
+        self.assertTrue(path_exists(conf_file))
         self.cp.read([conf_file])
         self.cp.parse_all()
         self.assertEquals(self.cp.get('__main__', 'ignore').value,
@@ -647,7 +648,7 @@
             fp.write('[__main__]\n')
             fp.write('ignore = .*\\.pyc\n')  # all .pyc files
             fp.write('         .*\\.sw[opnx]\n')  # all gvim temp files
-        self.assertTrue(os.path.exists(conf_file))
+        self.assertTrue(path_exists(conf_file))
         self.cp.read([conf_file])
         self.cp.parse_all()
         self.assertEquals(self.cp.get('__main__', 'ignore').value,
 
=== modified file 'tests/syncdaemon/test_eq_inotify.py'
--- tests/syncdaemon/test_eq_inotify.py	2011-08-04 16:30:54 +0000
+++ tests/syncdaemon/test_eq_inotify.py	2011-08-09 16:37:30 +0000
@@ -28,7 +28,18 @@
 
 from contrib.testing.testcase import BaseTwistedTestCase, FakeMain, Listener
 from tests.syncdaemon.test_eventqueue import BaseEQTestCase
-from ubuntuone.platform import make_dir, make_link, open_file, path_exists
+from ubuntuone.platform import (
+    make_link,
+    make_dir,
+    open_file,
+    path_exists,
+    remove_file,
+    remove_dir,
+    rename,
+    set_no_rights,
+    set_file_readwrite,
+    set_dir_readwrite,
+)
 from ubuntuone.syncdaemon import volume_manager
 
 # our logging level
@@ -348,7 +359,7 @@
                     self.finished_error("received a wrong path")
                 else:
                     if innerself.hist == ["create"]:
-                        os.remove(testfile)
+                        remove_file(testfile)
                         self.finished_ok()
                     else:
                         msg = "Finished in bad condition: %s" % innerself.hist
@@ -448,7 +459,7 @@
         self.eq.subscribe(DontHitMe(self))
 
         # generate the event
-        os.remove(testfile)
+        remove_file(testfile)
         reactor.callLater(.1, self._deferred.callback, True)
         yield self._deferred
 
@@ -463,7 +474,7 @@
         self.eq.subscribe(DontHitMe(self))
 
         # generate the event
-        os.rmdir(testdir)
+        remove_dir(testdir)
         reactor.callLater(.1, self._deferred.callback, True)
         yield self._deferred
 
@@ -484,7 +495,7 @@
         self.eq.subscribe(DontHitMe(self))
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         reactor.callLater(.1, self._deferred.callback, True)
         yield self._deferred
 
@@ -505,7 +516,7 @@
         self.eq.subscribe(DontHitMe(self))
 
         # generate the event
-        os.rename(fromdir, todir)
+        rename(fromdir, todir)
         reactor.callLater(.1, self._deferred.callback, True)
         yield self._deferred
 
@@ -525,7 +536,7 @@
         self.eq.subscribe(DontHitMe(self))
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         reactor.callLater(.1, self._deferred.callback, True)
         yield self._deferred
 
@@ -544,7 +555,7 @@
         self.eq.subscribe(DontHitMe(self))
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         reactor.callLater(.1, self._deferred.callback, True)
         yield self._deferred
 
@@ -652,13 +663,13 @@
             f.read()
             f.close()
             # generate FS_FILE_DELETE
-            os.remove(fname)
+            remove_file(fname)
 
             fnamedir = os.path.join(path, 'testit.dir')
             # generate FS_DIR_CREATE
             os.mkdir(fnamedir)
             # generate FS_DIR_DELETE
-            os.rmdir(fnamedir)
+            remove_dir(fnamedir)
 
         def check():
             """Check."""
@@ -682,13 +693,13 @@
         f.read()
         f.close()
         # generate FS_FILE_DELETE
-        os.remove(fname)
+        remove_file(fname)
 
         fnamedir = os.path.join(path, 'testit.dir')
         # generate FS_DIR_CREATE
         os.mkdir(fnamedir)
         # generate FS_DIR_DELETE
-        os.rmdir(fnamedir)
+        remove_dir(fnamedir)
 
         expected = [('FS_FILE_CREATE', {'path': fname}),
                     ('FS_FILE_OPEN', {'path': fname}),
@@ -739,7 +750,7 @@
         path = self.udf.ancestors[-2] # an ancestor common to both UDFs
         # generate IN_MOVED_FROM and IN_MOVED_TO
         newpath = path + u'.old'
-        os.rename(path, newpath)
+        rename(path, newpath)
         assert path_exists(newpath)
 
         unsubscribed = []
@@ -774,7 +785,7 @@
         """UDF is unsubscribed if renamed."""
         original = self.eq.fs.vm.unsubscribe_udf
         newpath = self.udf.path + u'.old'
-        os.rename(self.udf.path, newpath)
+        rename(self.udf.path, newpath)
         assert path_exists(newpath)
 
         unsubscribed = []
@@ -816,7 +827,7 @@
 
         uid = self.udf.volume_id
         fnamedir = self.udf.path
-        os.rmdir(fnamedir)
+        remove_dir(fnamedir)
 
         def check():
             """Check."""
@@ -844,7 +855,7 @@
         self.listener.events = []
 
         fnamedir = self.udf.path
-        os.rmdir(fnamedir)
+        remove_dir(fnamedir)
 
         def check():
             """Check."""
@@ -878,7 +889,7 @@
                               "Removed watches don't match the expected")
             self._deferred.callback(True)
 
-        os.rmdir(self.udf.path)
+        remove_dir(self.udf.path)
         reactor.callLater(.1, check)
         return self._deferred
 
@@ -906,7 +917,7 @@
                               "Removed watches don't match the expected")
             self._deferred.callback(True)
 
-        os.rename(self.udf.path, self.udf.path + ".old")
+        rename(self.udf.path, self.udf.path + ".old")
         reactor.callLater(.1, check)
         return self._deferred
 
@@ -936,8 +947,8 @@
 
         path = self.udf.ancestors[-2] # an ancestor common to both UDFs
 
-        os.rename(self.udf.path, self.udf.path + ".old")
-        os.rename(path, path + ".old")
+        rename(self.udf.path, self.udf.path + ".old")
+        rename(path, path + ".old")
         reactor.callLater(.1, check)
         return self._deferred
 
@@ -957,7 +968,7 @@
     def test_file_open(self):
         """Test invalid_filename after open a file."""
         open_file(self.invalid_path, "w").close()
-        self.addCleanup(os.remove, self.invalid_path)
+        self.addCleanup(remove_file, self.invalid_path)
 
         yield self.eq.add_watch(self.root_dir)
         should_events = [
@@ -976,7 +987,7 @@
     def test_file_close_nowrite(self):
         """Test invalid_filename after a close no write."""
         open_file(self.invalid_path, "w").close()
-        self.addCleanup(os.remove, self.invalid_path)
+        self.addCleanup(remove_file, self.invalid_path)
         fh = open_file(self.invalid_path)
 
         yield self.eq.add_watch(self.root_dir)
@@ -1006,7 +1017,7 @@
 
         # generate the event
         open_file(self.invalid_path, "w").close()
-        self.addCleanup(os.remove, self.invalid_path)
+        self.addCleanup(remove_file, self.invalid_path)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1021,7 +1032,7 @@
 
         # generate the event
         os.mkdir(self.invalid_path)
-        self.addCleanup(os.rmdir, self.invalid_path)
+        self.addCleanup(remove_dir, self.invalid_path)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1037,7 +1048,7 @@
         self.eq.subscribe(DynamicHitMe(should_events, self))
 
         # generate the event
-        os.remove(self.invalid_path)
+        remove_file(self.invalid_path)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1053,7 +1064,7 @@
         self.eq.subscribe(DynamicHitMe(should_events, self))
 
         # generate the event
-        os.rmdir(self.invalid_path)
+        remove_dir(self.invalid_path)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1072,8 +1083,8 @@
         self.eq.subscribe(DynamicHitMe(should_events, self))
 
         # generate the event
-        os.rename(self.invalid_path, destfile)
-        self.addCleanup(os.remove, destfile)
+        rename(self.invalid_path, destfile)
+        self.addCleanup(remove_file, destfile)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1093,8 +1104,8 @@
         self.eq.subscribe(DynamicHitMe(should_events, self))
 
         # generate the event
-        os.rename(fromfile, destfile)
-        self.addCleanup(os.remove, destfile)
+        rename(fromfile, destfile)
+        self.addCleanup(remove_file, destfile)
         yield self._deferred
 
 
@@ -1113,7 +1124,7 @@
                 if path != testfile:
                     self.finished_error("received a wrong path")
                 else:
-                    os.remove(testfile)
+                    remove_file(testfile)
                     self.finished_ok()
 
         yield self.eq.add_watch(self.root_dir)
@@ -1137,7 +1148,7 @@
                 if path != testfile:
                     self.finished_error("received a wrong path")
                 else:
-                    os.remove(testfile)
+                    remove_file(testfile)
                     self.finished_ok()
 
         yield self.eq.add_watch(self.root_dir)
@@ -1169,7 +1180,7 @@
                     self.finished_error("received a wrong path")
                 else:
                     if innerself.hist == ["create"]:
-                        os.remove(testfile)
+                        remove_file(testfile)
                         self.finished_ok()
                     else:
                         msg = "Finished in bad condition: %s" % innerself.hist
@@ -1194,7 +1205,7 @@
                 if path != testdir:
                     self.finished_error("received a wrong path")
                 else:
-                    os.rmdir(testdir)
+                    remove_dir(testdir)
                     self.finished_ok()
 
         yield self.eq.add_watch(self.root_dir)
@@ -1228,7 +1239,7 @@
         self.eq.subscribe(HitMe())
 
         # generate the event
-        os.remove(testfile)
+        remove_file(testfile)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1258,7 +1269,7 @@
         self.eq.subscribe(HitMe())
 
         # generate the event
-        os.rmdir(testdir)
+        remove_dir(testdir)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1298,15 +1309,15 @@
                 if path != fromfile:
                     self.finished_error("received a wrong path")
                 else:
-                    os.remove(tofile)
-                    os.rmdir(helpdir)
+                    remove_file(tofile)
+                    remove_dir(helpdir)
                     self.finished_ok()
 
         yield self.eq.add_watch(self.root_dir)
         self.eq.subscribe(HitMe())
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1325,15 +1336,15 @@
                 if path != fromdir:
                     self.finished_error("received a wrong path")
                 else:
-                    os.rmdir(todir)
-                    os.rmdir(helpdir)
+                    remove_dir(todir)
+                    remove_dir(helpdir)
                     self.finished_ok()
 
         yield self.eq.add_watch(self.root_dir)
         self.eq.subscribe(HitMe())
 
         # generate the event
-        os.rename(fromdir, todir)
+        rename(fromdir, todir)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1352,15 +1363,15 @@
                 if path != tofile:
                     self.finished_error("received a wrong path")
                 else:
-                    os.remove(tofile)
-                    os.rmdir(helpdir)
+                    remove_file(tofile)
+                    remove_dir(helpdir)
                     self.finished_ok()
 
         yield self.eq.add_watch(self.root_dir)
         self.eq.subscribe(HitMe())
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1379,15 +1390,15 @@
                 if path != todir:
                     self.finished_error("received a wrong path")
                 else:
-                    os.rmdir(todir)
-                    os.rmdir(helpdir)
+                    remove_dir(todir)
+                    remove_dir(helpdir)
                     self.finished_ok()
 
         yield self.eq.add_watch(self.root_dir)
         self.eq.subscribe(HitMe())
 
         # generate the event
-        os.rename(fromdir, todir)
+        rename(fromdir, todir)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1407,7 +1418,7 @@
         self.eq.subscribe(DynamicHitMe(should_events, self))
 
         # generate the event
-        os.rename(fromdir, todir)
+        rename(fromdir, todir)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1427,7 +1438,7 @@
         self.eq.subscribe(DynamicHitMe(should_events, self))
 
         # generate the event
-        os.rename(fromdir, todir)
+        rename(fromdir, todir)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1449,7 +1460,7 @@
         self.eq.subscribe(DynamicHitMe(should_events, self))
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1469,7 +1480,7 @@
         self.eq.subscribe(DynamicHitMe(should_events, self))
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1501,13 +1512,13 @@
 
         # generate the events
         open_file(mypath("foo"), "w").close()
-        os.rename(mypath("foo"), mypath("dir", "foo"))
+        rename(mypath("foo"), mypath("dir", "foo"))
         open_file(mypath("bar"), "w").close()
-        os.rename(mypath("dir", "foo"), mypath("foo"))
-        os.rename(mypath("bar"), mypath("dir", "bar"))
-        os.remove(mypath("foo"))
-        os.rename(mypath("dir", "bar"), mypath("bar"))
-        os.remove(mypath("bar"))
+        rename(mypath("dir", "foo"), mypath("foo"))
+        rename(mypath("bar"), mypath("dir", "bar"))
+        remove_file(mypath("foo"))
+        rename(mypath("dir", "bar"), mypath("bar"))
+        remove_file(mypath("bar"))
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1530,14 +1541,14 @@
                 elif path_to != tofile:
                     self.finished_error("received a wrong path in to")
                 else:
-                    os.remove(tofile)
+                    remove_file(tofile)
                     self.finished_ok()
 
         yield self.eq.add_watch(self.root_dir)
         self.eq.subscribe(HitMe())
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1560,14 +1571,14 @@
                 elif path_to != todir:
                     self.finished_error("received a wrong path in to")
                 else:
-                    os.rmdir(todir)
+                    remove_dir(todir)
                     self.finished_ok()
 
         yield self.eq.add_watch(self.root_dir)
         self.eq.subscribe(HitMe())
 
         # generate the event
-        os.rename(fromdir, todir)
+        rename(fromdir, todir)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1603,11 +1614,11 @@
         # generate the events
         open_file(mypath("foo"), "w").close()
         open_file(mypath("bar"), "w").close()
-        os.rename(mypath("foo"), mypath("dir", "foo"))
-        os.rename(mypath("dir", "foo"), mypath("foo"))
-        os.rename(mypath("bar"), mypath("baz"))
-        os.remove(mypath("foo"))
-        os.remove(mypath("baz"))
+        rename(mypath("foo"), mypath("dir", "foo"))
+        rename(mypath("dir", "foo"), mypath("foo"))
+        rename(mypath("bar"), mypath("baz"))
+        remove_file(mypath("foo"))
+        remove_file(mypath("baz"))
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1646,7 +1657,7 @@
         self.eq.subscribe(HitMe())
 
         # generate the event
-        os.rename(testdir, os.path.join(trash, os.path.basename(testdir)))
+        rename(testdir, os.path.join(trash, os.path.basename(testdir)))
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1665,8 +1676,8 @@
                 if path != newfilepath:
                     self.finished_error("received a wrong path")
                 else:
-                    os.remove(newfilepath)
-                    os.rmdir(newdirname)
+                    remove_file(newfilepath)
+                    remove_dir(newdirname)
                     self.finished_ok()
 
         yield self.eq.add_watch(self.root_dir)
@@ -1674,7 +1685,7 @@
         self.eq.subscribe(HitMe())
 
         # rename the dir
-        os.rename(testdir, newdirname)
+        rename(testdir, newdirname)
 
         # generate the event
         newfilepath = os.path.join(newdirname, "afile")
@@ -1699,7 +1710,7 @@
         yield self.eq.add_watch(root_dir)
 
         # generate the event
-        os.rename(fromfile, tofile)
+        rename(fromfile, tofile)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1721,7 +1732,7 @@
         yield self.eq.add_watch(root_dir)
 
         # generate the event
-        os.rename(fromdir, todir)
+        rename(fromdir, todir)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1750,8 +1761,8 @@
         yield self.eq.add_watch(dir1)
 
         # generate the event
-        os.rename(dir1, dir2)
-        os.remove(tofile)
+        rename(dir1, dir2)
+        remove_file(tofile)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1771,7 +1782,7 @@
         yield self.eq.add_watch(self.root_dir)
 
         # generate the event
-        os.rename(testfile + ".u1conflict", destfile)
+        rename(testfile + ".u1conflict", destfile)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1790,7 +1801,7 @@
         yield self.eq.add_watch(self.root_dir)
 
         # generate the event
-        os.rename(testfile + ".u1conflict", testfile)
+        rename(testfile + ".u1conflict", testfile)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1808,7 +1819,7 @@
         yield self.eq.add_watch(self.root_dir)
 
         # generate the event
-        os.rename(testdir + ".u1conflict", testdir)
+        rename(testdir + ".u1conflict", testdir)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1827,7 +1838,7 @@
         yield self.eq.add_watch(self.root_dir)
 
         # generate the event
-        os.rename(testdir + ".u1conflict", destdir)
+        rename(testdir + ".u1conflict", destdir)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1856,8 +1867,8 @@
         # generate the event
         open_file(testfile, "w").close()
         # and change the permissions so it's ignored
-        os.chmod(testfile, 0000)
-        self.addCleanup(os.chmod, testfile, 0644)
+        set_no_rights(testfile)
+        self.addCleanup(set_file_readwrite, testfile)
 
         def check(record):
             self.assertIn(testfile, record.args)
@@ -1891,8 +1902,8 @@
         # generate the event
         os.makedirs(testdir)
         # and change the permissions so it's ignored
-        os.chmod(testdir, 0000)
-        self.addCleanup(os.chmod, testdir, 0755)
+        set_no_rights(testdir)
+        self.addCleanup(set_dir_readwrite, testdir)
 
         def check(record):
             self.assertIn(testdir, record.args)
@@ -1935,7 +1946,7 @@
         yield self.eq.add_watch(base2)
 
         # generate the event
-        os.rename(moving1, moving2)
+        rename(moving1, moving2)
         yield self._deferred
 
     @defer.inlineCallbacks
@@ -1966,5 +1977,5 @@
         yield self.eq.add_watch(base2)
 
         # generate the event
-        os.rename(moving1, moving2)
+        rename(moving1, moving2)
         yield self._deferred
 
=== modified file 'tests/syncdaemon/test_fsm.py'
--- tests/syncdaemon/test_fsm.py	2011-08-04 16:30:54 +0000
+++ tests/syncdaemon/test_fsm.py	2011-08-09 16:37:30 +0000
@@ -37,7 +37,16 @@
 )
 
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.platform import make_dir, make_link, open_file, path_exists
+from ubuntuone.platform import (
+    make_dir,
+    make_link,
+    open_file,
+    path_exists,
+    remove_dir,
+    remove_file,
+    set_dir_readonly,
+    set_dir_readwrite,
+)
 from ubuntuone.syncdaemon.filesystem_manager import (
     DirectoryNotRemovable,
     EnableShareWrite,
@@ -84,9 +93,11 @@
         self.tritcask_path = self.mktemp("tritcask")
 
         self.db = Tritcask(self.tritcask_path)
+        self.addCleanup(self.db.shutdown)
         self.fsm = FileSystemManager(self.fsmdir, self.partials_dir,
                                      FakeVolumeManager(self.root_dir), self.db)
         self.eq = EventQueue(self.fsm)
+        self.addCleanup(self.eq.shutdown)
         self.fsm.register_eq(self.eq)
         self.share = yield self.create_share('share', 'share_name')
         self.share_path = self.share.path
@@ -96,15 +107,7 @@
         self.handler = MementoHandler()
         self.handler.setLevel(0)
         logger.root_logger.addHandler(self.handler)
-
-    @defer.inlineCallbacks
-    def tearDown(self):
-        """Clean up the tests."""
-        self.eq.shutdown()
-        self.db.shutdown()
-        # remove the handler
-        logger.root_logger.removeHandler(self.handler)
-        yield super(FSMTestCase, self).tearDown()
+        self.addCleanup(logger.root_logger.removeHandler, self.handler)
 
     @defer.inlineCallbacks
     def create_share(self, share_id, share_name, fsm=None, shares_dir=None,
@@ -144,7 +147,7 @@
         db = Tritcask(fsmdir)
         FileSystemManager(fsmdir, partials_dir,
                           FakeVolumeManager(fsmdir), db)
-        self.assertTrue(os.path.exists(fsmdir))
+        self.assertTrue(path_exists(fsmdir))
         db.shutdown()
 
     @defer.inlineCallbacks
@@ -319,7 +322,7 @@
 
         # delete the version that should have left the previous fsm
         version_file = os.path.join(self.fsmdir, "metadata_version")
-        os.remove(version_file)
+        remove_file(version_file)
 
         # create a old-style fs with the data:
         old_fs = FileShelf(self.fsm.old_fs._path)
@@ -682,7 +685,7 @@
 
         # delete the version that should have left the previous fsm
         version_file = os.path.join(self.fsmdir, "metadata_version")
-        os.remove(version_file)
+        remove_file(version_file)
 
         # start up again, and check
         db = Tritcask(self.tritcask_path+'.new')
@@ -838,7 +841,7 @@
 
         # delete the version that should have left the previous fsm
         version_file = os.path.join(self.fsmdir, "metadata_version")
-        os.remove(version_file)
+        remove_file(version_file)
 
         # start up again, and check
         db = Tritcask(self.tritcask_path+'.new')
@@ -1063,6 +1066,7 @@
                                  mdid, mdid_1)
         db.shutdown()
 
+
 class GetSetTests(FSMTestCase):
     """Test the get/set interface."""
 
@@ -1491,14 +1495,18 @@
 
     def test_no_tree(self):
         """Test just receiving the dir and not the tree."""
-        expected = ['a/b', 'a/b1', 'a/b2', 'a/c', 'a/x.txt']
+        expected = [os.path.join('a', 'b'),
+                    os.path.join('a', 'b1'),
+                    os.path.join( 'a', 'b2'),
+                    os.path.join( 'a', 'c'),
+                    os.path.join( 'a', 'x.txt')]
         actual = sorted([d.path for d in self.fsm.get_mdobjs_in_dir(
                                     os.path.join(self.share.path, 'a'))])
         self.assertEqual(expected, actual)
 
     def test_similar_paths(self):
         """Test having similar paths (a/b, a/b1, a/b2)."""
-        expected = ['a/b/y.txt']
+        expected = [os.path.join('a', 'b', 'y.txt')]
         actual = sorted([d.path for d in self.fsm.get_mdobjs_in_dir(
                                     os.path.join(self.share.path, 'a', 'b'))])
         self.assertEqual(expected, actual)
@@ -1639,7 +1647,7 @@
         # create partial ok
         self.fsm.create_partial("uuid", "share")
         self.assertTrue(self.fsm.get_by_mdid(mdid).info.is_partial)
-        self.assertTrue(os.path.exists(partial_path))
+        self.assertTrue(path_exists(partial_path))
         mdobj = self.fsm.get_by_mdid(mdid)
         when = mdobj.info.last_partial_created
         now = time.time()
@@ -1668,7 +1676,7 @@
 
         # commit partial, and check that the file is moved, and metadata is ok
         self.fsm.commit_partial("uuid", "share", local_hash=9876)
-        self.assertFalse(os.path.exists(partial_path))
+        self.assertFalse(path_exists(partial_path))
         with open(testfile) as fh:
             in_file = fh.read()
         self.assertEqual(in_file, "test info!")
@@ -1706,7 +1714,7 @@
 
         # remove partial, and check that the file is gone, and metadata is ok
         self.fsm.remove_partial("uuid", "share")
-        self.assertFalse(os.path.exists(partial_path))
+        self.assertFalse(path_exists(partial_path))
         with open(testfile) as fh:
             in_file = fh.read()
         self.assertEqual(in_file, "previous stuff!")
@@ -1735,7 +1743,7 @@
         self.assertTrue(self.fsm.get_by_mdid(mdid).info.is_partial)
         partial_path = os.path.join(self.fsm.partials_dir,
                             mdid + ".u1partial." + os.path.basename(testdir))
-        self.assertTrue(os.path.exists(partial_path))
+        self.assertTrue(path_exists(partial_path))
         mdobj = self.fsm.get_by_mdid(mdid)
         when = mdobj.info.last_partial_created
         now = time.time()
@@ -1756,10 +1764,10 @@
         # create partial ok
         self.fsm.create_partial("uuid", "share")
         self.assertTrue(self.fsm.get_by_mdid(mdid).info.is_partial)
-        self.assertTrue(os.path.exists(testdir))
+        self.assertTrue(path_exists(testdir))
         partial_path = os.path.join(self.fsm.partials_dir,
                             mdid + ".u1partial." + os.path.basename(testdir))
-        self.assertTrue(os.path.exists(partial_path))
+        self.assertTrue(path_exists(partial_path))
         mdobj = self.fsm.get_by_mdid(mdid)
         when = mdobj.info.last_partial_created
         now = time.time()
@@ -1799,7 +1807,7 @@
         self.fsm.remove_partial("uuid", "share")
         partial_path = os.path.join(self.fsm.partials_dir,
                             mdid + ".u1partial." + os.path.basename(testdir))
-        self.assertFalse(os.path.exists(partial_path))
+        self.assertFalse(path_exists(partial_path))
         mdobj = self.fsm.get_by_mdid(mdid)
         self.assertFalse(mdobj.info.is_partial)
         when = mdobj.info.last_partial_removed
@@ -1842,7 +1850,7 @@
         self.fsm.set_node_id(testfile, "uuid")
 
         # ugly problem not handled
-        os.rmdir(self.partials_dir)
+        remove_dir(self.partials_dir)
         try:
             self.fsm.create_partial("uuid", "share")
         except IOError, e:
@@ -1871,7 +1879,7 @@
                     repeat -= 10
             else:
                 fh.close()
-                os.unlink(testfile)
+                remove_file(testfile)
                 break
         mdid = self.fsm.create(testfile, "share")
         self.fsm.set_node_id(testfile, "uuid")
@@ -1978,7 +1986,7 @@
 
         # move first time
         self.fsm.move_to_conflict(mdid)
-        self.assertFalse(os.path.exists(testfile))
+        self.assertFalse(path_exists(testfile))
         with open(testfile + self.fsm.CONFLICT_SUFFIX) as fh:
             in_file = fh.read()
         self.assertEqual(in_file, "test!")
@@ -1991,7 +1999,7 @@
         with open(testfile, "w") as fh:
             fh.write("test 1!")
         self.fsm.move_to_conflict(mdid)
-        self.assertFalse(os.path.exists(testfile))
+        self.assertFalse(path_exists(testfile))
         with open(testfile + ".u1conflict.1") as fh:
             in_file = fh.read()
         self.assertEqual(in_file, "test 1!")
@@ -2004,7 +2012,7 @@
         with open(testfile, "w") as fh:
             fh.write("test 6!")
         self.fsm.move_to_conflict(mdid)
-        self.assertFalse(os.path.exists(testfile))
+        self.assertFalse(path_exists(testfile))
         with open(testfile + ".u1conflict.6") as fh:
             in_file = fh.read()
         self.assertEqual(in_file, "test 6!")
@@ -2079,7 +2087,7 @@
         # move the file
         to_path = os.path.join(self.share_path, "path2")
         self.fsm.move_file("share", testfile, to_path)
-        self.assertFalse(os.path.exists(testfile))
+        self.assertFalse(path_exists(testfile))
         with open(to_path) as fh:
             in_file = fh.read()
         self.assertEqual(in_file, "test!")
@@ -2094,7 +2102,7 @@
         os.mkdir(os.path.join(self.share_path, "testdir"))
         to_path = os.path.join(self.share_path, "testdir", "path3")
         self.fsm.move_file("share", from_path, to_path)
-        self.assertFalse(os.path.exists(from_path))
+        self.assertFalse(path_exists(from_path))
         with open(to_path) as fh:
             in_file = fh.read()
         self.assertEqual(in_file, "test!")
@@ -2128,7 +2136,7 @@
 
         # move the file
         self.fsm.move_file("share", testfile1, testfile2)
-        self.assertFalse(os.path.exists(testfile1))
+        self.assertFalse(path_exists(testfile1))
         with open(testfile2) as fh:
             in_file = fh.read()
         self.assertEqual(in_file, "test 1")
@@ -2152,8 +2160,8 @@
         os.mkdir(from_path)
         to_path = os.path.join(self.share_path, "path2")
         self.fsm.move_file("share", from_path, to_path)
-        self.assertFalse(os.path.exists(from_path))
-        self.assertTrue(os.path.exists(to_path))
+        self.assertFalse(path_exists(from_path))
+        self.assertTrue(path_exists(to_path))
         mdobj = self.fsm.get_by_mdid(mdid)
         self.assertEqual(mdobj.info.last_moved_from, from_path)
         when = mdobj.info.last_moved_time
@@ -2165,8 +2173,8 @@
         os.mkdir(os.path.join(self.share_path, "testdir"))
         to_path = os.path.join(self.share_path, "testdir", "path3")
         self.fsm.move_file("share", from_path, to_path)
-        self.assertFalse(os.path.exists(from_path))
-        self.assertTrue(os.path.exists(to_path))
+        self.assertFalse(path_exists(from_path))
+        self.assertTrue(path_exists(to_path))
         mdobj = self.fsm.get_by_mdid(mdid)
         self.assertEqual(mdobj.info.last_moved_from, from_path)
         when = mdobj.info.last_moved_time
@@ -2196,8 +2204,8 @@
         # move the dir
         to_path = os.path.join(self.share_path, "path2")
         self.fsm.move_file("share", from_path, to_path)
-        self.assertFalse(os.path.exists(from_path))
-        self.assertTrue(os.path.exists(to_path))
+        self.assertFalse(path_exists(from_path))
+        self.assertTrue(path_exists(to_path))
         mdobj = self.fsm.get_by_mdid(mdid)
         self.assertEqual(mdobj.info.last_moved_from, from_path)
         when = mdobj.info.last_moved_time
@@ -2206,14 +2214,14 @@
 
         # check that file inside is ok
         newfilepath = os.path.join(to_path, "file.txt")
-        self.assertFalse(os.path.exists(filepath))
-        self.assertTrue(os.path.exists(newfilepath))
+        self.assertFalse(path_exists(filepath))
+        self.assertTrue(path_exists(newfilepath))
         mdobj = self.fsm.get_by_path(newfilepath)
         self.assertEqual(mdobj.mdid, fileid)
-        self.assertEqual(mdobj.path, "path2/file.txt")
+        self.assertEqual(mdobj.path, os.path.join('path2', 'file.txt'))
 
         # check the outer file
-        self.assertTrue(os.path.exists(otherfile))
+        self.assertTrue(path_exists(otherfile))
         mdobj = self.fsm.get_by_path(otherfile)
         self.assertEqual(mdobj.path, "pa")
 
@@ -2226,7 +2234,7 @@
 
         # delete the file
         self.fsm.delete_file(testfile)
-        self.assertFalse(os.path.exists(testfile))
+        self.assertFalse(path_exists(testfile))
         self.assert_no_metadata(mdid, testfile, "share", "uuid")
 
     def test_delete_file_directly(self):
@@ -2267,12 +2275,12 @@
         self.assertEqual(self.fsm.get_by_mdid(mdid).path, "path")
         self.assertEqual(self.fsm.get_by_path(testdir).path, "path")
         self.assertEqual(self.fsm.get_by_node_id("share", "uuid").path, "path")
-        os.remove(os.path.join(testdir, "foo"))
+        remove_file(os.path.join(testdir, "foo"))
 
         # really delete the dir
         self.fsm.delete_file(testdir)
 
-        self.assertFalse(os.path.exists(testdir))
+        self.assertFalse(path_exists(testdir))
         self.assert_no_metadata(mdid, testdir, "share", "uuid")
 
     def test_delete_dir_directly(self):
@@ -2318,10 +2326,10 @@
 
         self.fsm.delete_file(local_dir)
 
-        self.assertFalse(os.path.exists(local_file))
+        self.assertFalse(path_exists(local_file))
         self.assert_no_metadata(mdid_file, local_file, "", "uuid_file")
 
-        self.assertFalse(os.path.exists(local_dir))
+        self.assertFalse(path_exists(local_dir))
         self.assert_no_metadata(mdid, local_dir, "", "uuid")
 
     def test_delete_nonempty_cleanable_dir_directly(self):
@@ -2459,11 +2467,11 @@
 
         # move the dir to conflict, the file is still there, but with no MD
         self.fsm.move_to_conflict(mdid1)
-        self.assertFalse(os.path.exists(tdir))
-        self.assertTrue(os.path.exists(tdir + self.fsm.CONFLICT_SUFFIX))
+        self.assertFalse(path_exists(tdir))
+        self.assertTrue(path_exists(tdir + self.fsm.CONFLICT_SUFFIX))
         testfile = os.path.join(self.share_path,
                                 tdir + self.fsm.CONFLICT_SUFFIX, "path")
-        self.assertTrue(os.path.exists(testfile))
+        self.assertTrue(path_exists(testfile))
         self.assertTrue(self.fsm.get_by_mdid(mdid1))
         self.assert_no_metadata(mdid2, testfile, "share", "uuid2")
 
@@ -2487,16 +2495,16 @@
 
         # move the dir2 to conflict, see dir2 and file inside it went ok
         self.fsm.move_to_conflict(mdid2)
-        self.assertFalse(os.path.exists(tdir2))
-        self.assertTrue(os.path.exists(tdir2 + self.fsm.CONFLICT_SUFFIX))
+        self.assertFalse(path_exists(tdir2))
+        self.assertTrue(path_exists(tdir2 + self.fsm.CONFLICT_SUFFIX))
         testfile = os.path.join(self.share_path,
                                 tdir2 + self.fsm.CONFLICT_SUFFIX, "path")
-        self.assertTrue(os.path.exists(testfile))
+        self.assertTrue(path_exists(testfile))
         self.assertTrue(self.fsm.get_by_mdid(mdid2))
         self.assertRaises(KeyError, self.fsm.get_by_mdid, mdid3)
 
         # and check that the one with similar path is untouched
-        self.assertTrue(os.path.exists(tdir1))
+        self.assertTrue(path_exists(tdir1))
         self.assertTrue(self.fsm.get_by_mdid(mdid1))
 
 
@@ -2815,7 +2823,7 @@
         mdid = self.fsm.create(local_dir, "", is_dir=True)
         os.mkdir(local_dir)
         self.fsm.make_dir(mdid)
-        self.assertTrue(os.path.exists(local_dir))
+        self.assertTrue(path_exists(local_dir))
 
     @defer.inlineCallbacks
     def test_make_dir_in_ro_share(self):
@@ -2825,7 +2833,7 @@
         testdir = os.path.join(share.path, "foo")
         mdid = self.fsm.create(testdir, 'ro_share_id', is_dir=True)
         self.fsm.make_dir(mdid)
-        self.assertTrue(os.path.exists(testdir))
+        self.assertTrue(path_exists(testdir))
 
     @defer.inlineCallbacks
     def test_make_dir_ro_watch(self):
@@ -2915,7 +2923,7 @@
                          self.fsm.CHANGED_SERVER)
 
         # remove the .partial by hand, to see it crash
-        os.remove(partial_path)
+        remove_file(partial_path)
         # pylint: disable-msg=W0212
         self.assertRaises(InconsistencyError,
                           self.fsm._check_partial, mdid=mdid)
@@ -3060,7 +3068,7 @@
         fd = self.fsm.get_partial_for_writing('uuid2', share.volume_id)
         fd.flush()
         fd.close()
-        self.assertTrue(os.path.exists(testdir))
+        self.assertTrue(path_exists(testdir))
 
     @defer.inlineCallbacks
     def test_file_ro_share(self):
@@ -3075,7 +3083,7 @@
         fd.flush()
         fd.close()
         self.fsm.commit_partial('uuid3', self.share.volume_id, None)
-        self.assertTrue(os.path.exists(testfile))
+        self.assertTrue(path_exists(testfile))
 
     @defer.inlineCallbacks
     def test_delete_dir_ro_share(self):
@@ -3090,9 +3098,9 @@
         fd.flush()
         fd.close()
         self.fsm.remove_partial('uuid2', share.volume_id)
-        self.assertTrue(os.path.exists(testdir))
+        self.assertTrue(path_exists(testdir))
         self.fsm.delete_file(testdir)
-        self.assertFalse(os.path.exists(testdir))
+        self.assertFalse(path_exists(testdir))
 
     @defer.inlineCallbacks
     def test_delete_non_empty_dir_ro_share(self):
@@ -3118,11 +3126,11 @@
         fd.close()
         self.fsm.commit_partial('uuid3', share.volume_id, None)
         self.fsm.upload_finished(mdid, self.fsm.get_by_mdid(mdid).local_hash)
-        self.assertTrue(os.path.exists(testdir))
-        self.assertTrue(os.path.exists(testfile))
+        self.assertTrue(path_exists(testdir))
+        self.assertTrue(path_exists(testfile))
         self.fsm.delete_file(testdir)
-        self.assertFalse(os.path.exists(testdir))
-        self.assertFalse(os.path.exists(testfile))
+        self.assertFalse(path_exists(testdir))
+        self.assertFalse(path_exists(testfile))
 
     @defer.inlineCallbacks
     def test_delete_non_empty_dir_rw_share(self):
@@ -3148,11 +3156,11 @@
         fd.close()
         self.fsm.commit_partial('uuid3', share.volume_id, None)
         self.fsm.upload_finished(mdid, self.fsm.get_by_mdid(mdid).local_hash)
-        self.assertTrue(os.path.exists(testdir))
-        self.assertTrue(os.path.exists(testfile))
+        self.assertTrue(path_exists(testdir))
+        self.assertTrue(path_exists(testfile))
         self.fsm.delete_file(testdir)
-        self.assertFalse(os.path.exists(testdir))
-        self.assertFalse(os.path.exists(testfile))
+        self.assertFalse(path_exists(testdir))
+        self.assertFalse(path_exists(testfile))
 
     @defer.inlineCallbacks
     def test_delete_non_empty_dir_bad_perms_rw_share(self):
@@ -3178,16 +3186,18 @@
         fd.close()
         self.fsm.commit_partial('uuid3', share.volume_id, None)
         self.fsm.upload_finished(mdid, self.fsm.get_by_mdid(mdid).local_hash)
-        self.assertTrue(os.path.exists(testdir))
-        self.assertTrue(os.path.exists(testfile))
+        self.assertTrue(path_exists(testdir))
+        self.assertTrue(path_exists(testfile))
 
         # make the dir read-only, the error should be logged
-        os.chmod(testdir, 0555)
+        set_dir_readonly(testdir)
+        self.addCleanup(set_dir_readwrite, testdir)
+
         self.fsm.delete_file(testdir)
         self.assertTrue(self.handler.check_warning("OSError", testdir,
                                                    "when trying to remove"))
-        self.assertTrue(os.path.exists(testdir))
-        self.assertTrue(os.path.exists(testfile))
+        self.assertTrue(path_exists(testdir))
+        self.assertTrue(path_exists(testfile))
 
     @defer.inlineCallbacks
     def test_delete_file_ro_share(self):
@@ -3202,9 +3212,9 @@
         fd.flush()
         fd.close()
         self.fsm.commit_partial('uuid3', self.share.volume_id, None)
-        self.assertTrue(os.path.exists(testfile))
+        self.assertTrue(path_exists(testfile))
         self.fsm.delete_file(testfile)
-        self.assertFalse(os.path.exists(testfile))
+        self.assertFalse(path_exists(testfile))
 
     @defer.inlineCallbacks
     def test_move_to_conflict_ro_share(self):
@@ -3220,9 +3230,9 @@
         fd.flush()
         fd.close()
         self.fsm.commit_partial('uuid3', self.share.volume_id, None)
-        self.assertTrue(os.path.exists(testfile))
+        self.assertTrue(path_exists(testfile))
         self.fsm.move_to_conflict(file_mdid)
-        self.assertTrue(os.path.exists(testfile + self.fsm.CONFLICT_SUFFIX))
+        self.assertTrue(path_exists(testfile + self.fsm.CONFLICT_SUFFIX))
 
     @defer.inlineCallbacks
     def test_file_rw_share_no_fail(self):
@@ -3230,7 +3240,7 @@
         share = yield self.create_share('ro_share', 'ro_share_name')
         testfile = os.path.join(share.path, "a_file")
         open(testfile, 'w').close()
-        self.assertTrue(os.path.exists(testfile))
+        self.assertTrue(path_exists(testfile))
 
     @defer.inlineCallbacks
     def test_dir_rw_share(self):
@@ -3243,7 +3253,7 @@
         fd = self.fsm.get_partial_for_writing('uuid2', share.volume_id)
         fd.flush()
         fd.close()
-        self.assertTrue(os.path.exists(testdir))
+        self.assertTrue(path_exists(testdir))
 
     @defer.inlineCallbacks
     def test_file_rw_share(self):
@@ -3257,7 +3267,7 @@
         fd.flush()
         fd.close()
         self.fsm.commit_partial('uuid3', self.share.volume_id, None)
-        self.assertTrue(os.path.exists(testfile))
+        self.assertTrue(path_exists(testfile))
 
     def test_share_and_root(self):
         """ Test the creation of a file with the same relative path in a share
@@ -3277,8 +3287,8 @@
         fd = self.fsm.get_partial_for_writing('uuid2', self.share.volume_id)
         fd.flush()
         fd.close()
-        self.assertTrue(os.path.exists(self.fsm.get_abspath("", a_dir_root)))
-        self.assertTrue(os.path.exists(a_dir_share))
+        self.assertTrue(path_exists(self.fsm.get_abspath("", a_dir_root)))
+        self.assertTrue(path_exists(a_dir_share))
 
 
 class TestEnableShareWrite(FSMTestCase):
@@ -3388,7 +3398,7 @@
 
         # delete the version that should have left the previous fsm
         version_file = os.path.join(self.data_dir, "metadata_version")
-        os.remove(version_file)
+        remove_file(version_file)
 
         # create a old-style fs with the data:
         old_fs = FileShelf(self.fsm.old_fs._path)
 
=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2011-08-08 20:22:25 +0000
+++ tests/syncdaemon/test_localrescan.py	2011-08-09 16:37:30 +0000
@@ -28,7 +28,7 @@
 
 from contrib.testing import testcase
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntuone.platform import make_link
+from ubuntuone.platform import make_link, remove_file, remove_dir, rename
 from ubuntuone.syncdaemon import local_rescan
 from ubuntuone.syncdaemon.marker import MDMarker
 from ubuntuone.syncdaemon.tritcask import Tritcask
@@ -1019,7 +1019,7 @@
         self.create_node("x", is_dir=False)
 
         # move the second into the first one
-        os.rename(pathy, pathx)
+        rename(pathy, pathx)
 
         # a & m times will be the same, but not the inode or change time
         def check(_):
@@ -1117,9 +1117,9 @@
 
         # remove a couple, create some new
         sh1 = os.path.join(self.share.path, "d")
-        os.remove(sh1)
+        remove_file(sh1)
         sh2 = os.path.join(self.share.path, "f")
-        os.remove(sh2)
+        remove_file(sh2)
         sh3 = os.path.join(self.share.path, "jj")
         open(sh3, "w").close()
         sh4 = os.path.join(self.share.path, "kk")
@@ -1243,7 +1243,7 @@
         for c in "abcdefgh":
             self.create_node(c, is_dir=False, which_share=self.share1)
         sh1 = os.path.join(self.share1.path, "d")
-        os.remove(sh1)
+        remove_file(sh1)
         sh2 = os.path.join(self.share1.path, "jj")
         open(sh2, "w").close()
 
@@ -1251,7 +1251,7 @@
         for c in "abcdefgh":
             self.create_node(c, is_dir=False, which_share=self.share2)
         sh3 = os.path.join(self.share2.path, "e")
-        os.remove(sh3)
+        remove_file(sh3)
         sh4 = os.path.join(self.share2.path, "kk")
         open(sh4, "w").close()
 
@@ -1765,7 +1765,7 @@
         self.fsm.create_partial("uuid", self.share.volume_id)
 
         # now, for some reason, we lose the partial file
-        os.remove(partial_path)
+        remove_file(partial_path)
 
         def check(_):
             """Compare predictable args, and check fh factory."""
@@ -1921,7 +1921,7 @@
 
 
         # now change the dir for a file, for LR to find it
-        os.rmdir(path)
+        remove_dir(path)
         open(path, "w").close()
 
         def check(_):
 
=== modified file 'tests/syncdaemon/test_main.py'
--- tests/syncdaemon/test_main.py	2011-08-03 21:41:45 +0000
+++ tests/syncdaemon/test_main.py	2011-08-09 16:37:30 +0000
@@ -28,7 +28,12 @@
 )
 from tests.platform import setup_main_test, get_main_params
 from ubuntuone.clientdefs import VERSION
-from ubuntuone.platform import make_link
+from ubuntuone.platform import (
+    is_link,
+    make_link,
+    path_exists,
+    remove_dir,
+)
 from ubuntuone.syncdaemon import main as main_mod
 
 
@@ -148,13 +153,13 @@
     def test_create_dirs_already_exists_dirs(self):
         """test that creating a Main instance works as expected."""
         link = os.path.join(self.root, 'Shared With Me')
-        self.assertFalse(os.path.exists(link))
-        self.assertTrue(os.path.exists(self.shares))
-        self.assertTrue(os.path.exists(self.root))
+        self.assertFalse(path_exists(link))
+        self.assertTrue(path_exists(self.shares))
+        self.assertTrue(path_exists(self.root))
         main = self.build_main()
-        self.assertTrue(os.path.exists(main.shares_dir_link))
+        self.assertTrue(path_exists(main.shares_dir_link))
         # check that the shares link is actually a link
-        self.assertTrue(os.path.islink(main.shares_dir_link))
+        self.assertTrue(is_link(main.shares_dir_link))
         self.assertEquals(link, main.shares_dir_link)
         main.shutdown()
 
@@ -162,41 +167,41 @@
         """test that creating a Main instance works as expected."""
         link = os.path.join(self.root, 'Shared With Me')
         make_link(self.shares, link)
-        self.assertTrue(os.path.exists(link))
-        self.assertTrue(os.path.islink(link))
-        self.assertTrue(os.path.exists(self.shares))
-        self.assertTrue(os.path.exists(self.root))
+        self.assertTrue(path_exists(link))
+        self.assertTrue(is_link(link))
+        self.assertTrue(path_exists(self.shares))
+        self.assertTrue(path_exists(self.root))
         main = self.build_main()
         # check that the shares link is actually a link
-        self.assertTrue(os.path.islink(main.shares_dir_link))
+        self.assertTrue(is_link(main.shares_dir_link))
         main.shutdown()
 
     def test_create_dirs_already_exists_but_not_symlink(self):
         """test that creating a Main instance works as expected."""
         link = os.path.join(self.root, 'Shared With Me')
         os.makedirs(link)
-        self.assertTrue(os.path.exists(link))
-        self.assertFalse(os.path.islink(link))
-        self.assertTrue(os.path.exists(self.shares))
-        self.assertTrue(os.path.exists(self.root))
+        self.assertTrue(path_exists(link))
+        self.assertFalse(is_link(link))
+        self.assertTrue(path_exists(self.shares))
+        self.assertTrue(path_exists(self.root))
         main = self.build_main()
         # check that the shares link is actually a link
         self.assertEquals(main.shares_dir_link, link)
-        self.assertFalse(os.path.islink(main.shares_dir_link))
+        self.assertFalse(is_link(main.shares_dir_link))
         main.shutdown()
 
     def test_create_dirs_none_exists(self):
         """test that creating a Main instance works as expected."""
         link = os.path.join(self.root, 'Shared With Me')
         # remove the existing dirs
-        os.rmdir(self.root)
-        os.rmdir(self.shares)
+        remove_dir(self.root)
+        remove_dir(self.shares)
         main = self.build_main()
         # check that the shares link is actually a link
-        self.assertTrue(os.path.exists(link))
-        self.assertTrue(os.path.islink(main.shares_dir_link))
-        self.assertTrue(os.path.exists(self.shares))
-        self.assertTrue(os.path.exists(self.root))
+        self.assertTrue(path_exists(link))
+        self.assertTrue(is_link(main.shares_dir_link))
+        self.assertTrue(path_exists(self.shares))
+        self.assertTrue(path_exists(self.root))
         main.shutdown()
 
     def test_connect_if_autoconnect_is_enabled(self):
 
=== modified file 'tests/syncdaemon/test_sync.py'
--- tests/syncdaemon/test_sync.py	2011-08-03 20:59:59 +0000
+++ tests/syncdaemon/test_sync.py	2011-08-09 16:37:30 +0000
@@ -43,6 +43,7 @@
 from ubuntuone.platform import (
     make_dir,
     open_file,
+    remove_file,
     stat_path,
 )
 from ubuntuone.syncdaemon.filesystem_manager import FileSystemManager
@@ -228,14 +229,14 @@
         self.main = FakeMain(root_dir=self.root, shares_dir=self.shares,
                              data_dir=self.data,
                              partials_dir=self.partials_dir)
+        self.addCleanup(self.main.shutdown)
         self._logger = logging.getLogger('ubuntuone.SyncDaemon')
         self._logger.addHandler(self.handler)
+        self.addCleanup(self._logger.removeHandler, self.handler)
 
     @defer.inlineCallbacks
     def tearDown(self):
         """Clean up."""
-        self._logger.removeHandler(self.handler)
-        self.main.shutdown()
         FakeMain._sync_class = None
         for record in self.handler.records:
             exc_info = getattr(record, 'exc_info', None)
@@ -811,7 +812,7 @@
         # create the partial correctly, and break it!
         self.fsm.create_partial('node_id', '')
         partial_path = self.fsm._get_partial_path(self.fsm.fs[self.mdid])
-        os.remove(partial_path)
+        remove_file(partial_path)
 
         # event!
         self.ssmr.commit_file('AQ_DOWNLOAD_COMMIT', None, 'hash')
 
=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2011-08-05 10:56:06 +0000
+++ tests/syncdaemon/test_vm.py	2011-08-09 16:37:30 +0000
@@ -63,6 +63,9 @@
     make_dir,
     path_exists,
     remove_link,
+    rename,
+    set_dir_readonly,
+    set_dir_readwrite,
 )
 
 # grab the metadata version before tests fiddle with it
@@ -918,7 +921,7 @@
         self.main.fs.set_node_id(path, 'dir_node_id')
         yield self.vm._add_watch(path)
 
-        os.rename(path, path + '.old')
+        rename(path, path + '.old')
         # remove the watches
         self.vm._remove_watches(self.root_dir)
 
@@ -3774,8 +3777,10 @@
         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)
-        os.chmod(self.root_dir, 0500)
-        os.chmod(shares_dir, 0500)
+        set_dir_readonly(self.root_dir)
+        self.addCleanup(set_dir_readwrite, self.root_dir)
+        set_dir_readonly(shares_dir)
+        self.addCleanup(set_dir_readwrite, shares_dir)
         version = self.md_upgrader._guess_metadata_version()
         self.assertEquals(None, version)
 
@@ -3789,8 +3794,10 @@
         shares_dir = os.path.join(self.root_dir, 'Shared With Me')
         remove_link(shares_dir)
         make_dir(shares_dir, recursive=True)
-        os.chmod(self.root_dir, 0500)
-        os.chmod(shares_dir, 0500)
+        set_dir_readonly(self.root_dir)
+        self.addCleanup(set_dir_readwrite, self.root_dir)
+        set_dir_readonly(shares_dir)
+        self.addCleanup(set_dir_readwrite, shares_dir)
         self.rmtree(self.shares_dir)
         version = self.md_upgrader._guess_metadata_version()
         self.assertIn(version, ['1', '2'])
@@ -3839,8 +3846,7 @@
         dirpath = os.path.join('path', 'to', 'metadata')
         files = ['not_yet.partial', ]
         mocker = Mocker()
-        # ensure that we do use the platform method and not the
-        # os.rename one
+        # ensure that we do use the platform method and not the renamed one
         os_helper_rename = mocker.replace('ubuntuone.platform.rename')
         is_string = lambda x: isinstance(x, str)
         os_helper_rename(MATCH(is_string), MATCH(is_string))
@@ -3853,8 +3859,7 @@
         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
-        # os.rename one
+        # ensure that we do use the platform method and not the renamed one
         self.md_upgrader._upgrade_metadata_6 = mocker.mock()
         os_helper_rename = mocker.replace('ubuntuone.platform.rename')
         is_string = lambda x: isinstance(x, str)
 
=== modified file 'ubuntuone/platform/linux/filesystem_notifications.py'
--- ubuntuone/platform/linux/filesystem_notifications.py	2011-07-28 22:21:07 +0000
+++ ubuntuone/platform/linux/filesystem_notifications.py	2011-08-09 16:37:30 +0000
@@ -24,9 +24,6 @@
 import pyinotify
 from twisted.internet import abstract, reactor, error, defer
 
-from ubuntuone.syncdaemon.filesystem_notifications import (
-    GeneralINotifyProcessor
-)
 
 # translates quickly the event and it's is_dir state to our standard events
 NAME_TRANSLATIONS = {
@@ -152,6 +149,10 @@
     FS_(DIR|FILE)_MOVE event when possible.
     """
     def __init__(self, monitor, ignore_config=None):
+        # XXX: avoid circular imports
+        from ubuntuone.syncdaemon.filesystem_notifications import (
+            GeneralINotifyProcessor
+        )
         self.general_processor = GeneralINotifyProcessor(monitor,
             self.handle_dir_delete, NAME_TRANSLATIONS,
             self.platform_is_ignored, pyinotify.IN_IGNORED,
 
=== modified file 'ubuntuone/platform/windows/filesystem_notifications.py'
--- ubuntuone/platform/windows/filesystem_notifications.py	2011-08-04 21:45:04 +0000
+++ ubuntuone/platform/windows/filesystem_notifications.py	2011-08-09 16:37:30 +0000
@@ -63,8 +63,6 @@
     IN_MOVED_FROM,
     IN_MOVED_TO,
     IN_MODIFY)
-from ubuntuone.syncdaemon.filesystem_notifications import (
-    GeneralINotifyProcessor)
 from ubuntuone.platform.windows.os_helper import (
     is_valid_syncdaemon_path,
     is_valid_windows_path,
@@ -471,6 +469,10 @@
     """
 
     def __init__(self, monitor, ignore_config=None):
+        # XXX: avoid circular imports.
+        from ubuntuone.syncdaemon.filesystem_notifications import (
+            GeneralINotifyProcessor
+        )
         self.general_processor = GeneralINotifyProcessor(monitor,
             self.handle_dir_delete, NAME_TRANSLATIONS,
             self.platform_is_ignored, IN_IGNORED, ignore_config=ignore_config)
 
=== modified file 'ubuntuone/syncdaemon/file_shelf.py'
--- ubuntuone/syncdaemon/file_shelf.py	2011-08-05 15:17:28 +0000
+++ ubuntuone/syncdaemon/file_shelf.py	2011-08-09 16:37:30 +0000
@@ -19,14 +19,23 @@
 """storage shelf using a files tree."""
 
 from __future__ import with_statement
-from UserDict import DictMixin
+
 import cPickle
 import os
 import stat
 import errno
+
 from collections import deque
-
-from ubuntuone.platform import make_dir, open_file, remove_file, rename, stat_path
+from UserDict import DictMixin
+
+from ubuntuone.platform import (
+    make_dir,
+    open_file,
+    remove_file,
+    rename,
+    stat_path,
+)
+
 
 class FileShelf(object, DictMixin):
     """ File based shelf.
 
=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2011-07-28 15:43:05 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2011-08-09 16:37:30 +0000
@@ -1558,7 +1558,7 @@
                 set_file_readonly(self.path)
 
         # restore all saved ones
-        exists = os.path.exists
+        exists = path_exists
         for path, isdir in self._changed_nodes[::-1]:
             if exists(path):
                 if isdir:
 
=== modified file 'ubuntuone/syncdaemon/filesystem_notifications.py'
--- ubuntuone/syncdaemon/filesystem_notifications.py	2011-04-20 09:13:43 +0000
+++ ubuntuone/syncdaemon/filesystem_notifications.py	2011-08-09 16:37:30 +0000
@@ -19,6 +19,7 @@
 import os
 import re
 
+from ubuntuone.platform import path_exists
 from ubuntuone.syncdaemon.mute_filter import MuteFilter
 from ubuntuone import logger
 # our logging level
@@ -96,7 +97,7 @@
         # check first if the platform code knows hat to do with it
         if not self.platform_is_ignored(path):
             # check if we can read
-            if os.path.exists(path) and not os.access(path, os.R_OK):
+            if path_exists(path) and not os.access(path, os.R_OK):
                 self.log.warning("Ignoring path as we don't have enough "
                                  "permissions to track it: %r", path)
                 return True
 
=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2011-06-24 20:24:51 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2011-08-09 16:37:30 +0000
@@ -205,7 +205,7 @@
             log_error("The received path is not in any share!")
             raise ValueError("The received path is not in any share!")
 
-        # uglier than os.path.exists and isdir, but only hit the disk once
+        # uglier than path_exists and isdir, but only hit the disk once
         stat_result = get_stat(direct)
         if stat_result is None:
             m = "The received path is not in disk: path %r  mdid %s"
 
=== modified file 'ubuntuone/syncdaemon/vm_helper.py'
--- ubuntuone/syncdaemon/vm_helper.py	2011-08-03 20:44:10 +0000
+++ ubuntuone/syncdaemon/vm_helper.py	2011-08-09 16:37:30 +0000
@@ -27,6 +27,7 @@
     make_link,
     path_exists,
     read_link,
+    remove_file,
 )
 
 
@@ -70,7 +71,7 @@
     if not path_exists(dest):
         # remove the symlink if it's broken
         if is_link(dest) and read_link(dest) != source:
-            os.remove(dest)
+            remove_file(dest)
         make_link(source, dest)
         return True
     else:
 
=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2011-08-03 20:20:02 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2011-08-09 16:37:30 +0000
@@ -57,6 +57,8 @@
     normpath,
     path_exists,
     read_link,
+    remove_file,
+    remove_dir,
     rename,
     set_dir_readonly,
     set_dir_readwrite,
@@ -68,8 +70,6 @@
 UDF_ROW_TYPE = 5
 
 
-
-
 class _Share(object):
     """Represents a share or mount point"""
 
@@ -1434,12 +1434,12 @@
 
     def _get_md_version(self):
         """Returns the current md_version"""
-        if not os.path.exists(self._data_dir):
+        if not path_exists(self._data_dir):
             # first run, the data dir don't exist. No metadata to upgrade
             md_version = VolumeManager.METADATA_VERSION
             os.makedirs(self._data_dir)
             self.update_metadata_version()
-        elif os.path.exists(self._version_file):
+        elif path_exists(self._version_file):
             with open(self._version_file) as fh:
                 md_version = fh.read().strip()
             if not md_version:
@@ -1454,7 +1454,7 @@
 
     def update_metadata_version(self):
         """Write the version of the metadata."""
-        if not os.path.exists(os.path.dirname(self._version_file)):
+        if not path_exists(os.path.dirname(self._version_file)):
             os.makedirs(os.path.dirname(self._version_file))
         with open(self._version_file, 'w') as fd:
             fd.write(VolumeManager.METADATA_VERSION)
@@ -1468,14 +1468,14 @@
 
         """
         md_version = None
-        if os.path.exists(self._shares_md_dir) \
-           and os.path.exists(self._shared_md_dir):
+        if path_exists(self._shares_md_dir) \
+           and path_exists(self._shared_md_dir):
             # we have shares and shared dirs
             # md_version >= 1
             old_root_dir = os.path.abspath(os.path.join(self._root_dir, 'My Files'))
             old_share_dir = os.path.abspath(os.path.join(self._root_dir,
                                                  'Shared With Me'))
-            if os.path.exists(old_share_dir) and os.path.exists(old_root_dir) \
+            if path_exists(old_share_dir) and path_exists(old_root_dir) \
                and not is_link(old_share_dir):
                 # md >= 1 and <= 3
                 # we have a My Files dir, 'Shared With Me' isn't a
@@ -1524,7 +1524,7 @@
         # the shelf already exists, and don't have a .version file
         # first backup the old data
         backup = os.path.join(self._data_dir, '0.bkp')
-        if not os.path.exists(backup):
+        if not path_exists(backup):
             os.makedirs(backup)
         # pylint: disable-msg=W0612
         # filter 'shares' and 'shared' dirs, in case we are in the case of
@@ -1539,7 +1539,7 @@
                                     os.path.join(backup, dir))
         # regenerate the shelf using the new layout using the backup as src
         old_shelf = LegacyShareFileShelf(backup)
-        if not os.path.exists(self._shares_dir):
+        if not path_exists(self._shares_dir):
             os.makedirs(self._shares_dir)
         new_shelf = LegacyShareFileShelf(self._shares_md_dir)
         for key, share in old_shelf.iteritems():
@@ -1629,19 +1629,19 @@
         old_share_dir = os.path.join(self._root_dir, 'Shared With Me')
         old_root_dir = os.path.join(self._root_dir, 'My Files')
         # change permissions
-        os.chmod(self._root_dir, 0775)
+        set_dir_readwrite(self._root_dir)
 
         def move(src, dst):
             """Move a file/dir taking care if it's read-only."""
             prev_mode = stat.S_IMODE(os.stat(src).st_mode)
-            os.chmod(src, 0755)
+            set_dir_readwrite(src)
             shutil.move(src, dst)
             os.chmod(dst, prev_mode)
 
         # update the path's in metadata and move the folder
-        if os.path.exists(old_share_dir) and not is_link(old_share_dir):
-            os.chmod(old_share_dir, 0775)
-            if not os.path.exists(os.path.dirname(self._shares_dir)):
+        if path_exists(old_share_dir) and not is_link(old_share_dir):
+            set_dir_readwrite(old_share_dir)
+            if not path_exists(os.path.dirname(self._shares_dir)):
                 os.makedirs(os.path.dirname(self._shares_dir))
             self.log.debug('moving shares dir from: %r to %r',
                            old_share_dir, self._shares_dir)
@@ -1649,7 +1649,7 @@
                 src = os.path.join(old_share_dir, path)
                 dst = os.path.join(self._shares_dir, path)
                 move(src, dst)
-            os.rmdir(old_share_dir)
+            remove_dir(old_share_dir)
 
         # update the shares metadata
         shares = LegacyShareFileShelf(self._shares_md_dir)
@@ -1670,25 +1670,25 @@
             shared[key] = share
         # move the My Files contents, taking care of dir/files with the same
         # name in the new root
-        if os.path.exists(old_root_dir):
+        if path_exists(old_root_dir):
             self.log.debug('moving My Files contents to the root')
             # make My Files rw
-            os.chmod(old_root_dir, 0775)
+            set_dir_readwrite(old_root_dir)
             path_join = os.path.join
             for relpath in listdir(old_root_dir):
                 old_path = path_join(old_root_dir, relpath)
                 new_path = path_join(self._root_dir, relpath)
-                if os.path.exists(new_path):
+                if path_exists(new_path):
                     shutil.move(new_path, new_path+'.u1conflict')
                 if relpath == 'Shared With Me':
                     # remove the Shared with Me symlink inside My Files!
                     self.log.debug('removing shares symlink from old root')
-                    os.remove(old_path)
+                    remove_file(old_path)
                 else:
                     self.log.debug('moving %r to %r', old_path, new_path)
                     move(old_path, new_path)
             self.log.debug('removing old root: %r', old_root_dir)
-            os.rmdir(old_root_dir)
+            remove_dir(old_root_dir)
 
         # fix broken symlink (md_version 4)
         self._upgrade_metadata_4(md_version)
@@ -1702,7 +1702,7 @@
                 # the symnlink points to itself
                 self.log.debug('removing broken shares symlink: %r -> %r',
                                self._shares_dir_link, target)
-                os.remove(self._shares_dir_link)
+                remove_file(self._shares_dir_link)
         self._upgrade_metadata_5(md_version)
 
     def _upgrade_metadata_5(self, md_version):