Merge lp:~nataliabidart/magicicada-client/clean-pos-ins into lp:magicicada-client

[Natalia Bidart]

- Have a working setup.py that would install locally and in custom locations.

[lp:~nataliabidart/magicicada-client/clean-pos-ins]

1437. By Natalia Bidart on 2016-10-24

Merged no-pos into clean-pos-ins.

1438. By Natalia Bidart on 2016-10-25

Merged no-pos into clean-pos-ins.

[Facundo Batista (facundo)]

Some comments inline.

In general, you're touching a lot of files and not fixing the copyright headers (removing specific authors, adding 2016 chicharreros, etc).

Beyond that, I wanted to check if this new "base dirs mangling" didn't break the development starting when trying a local server, but I couldn't make it work because other server issues: http://linkode.org/HgBj5gXEAtyNKzMxnCEyc5

Probably we should go with this branch, but then make sure all is ok for starting the client against a dev local server.

What do you think?

review: Needs Information

[lp:~nataliabidart/magicicada-client/clean-pos-ins]

1439. By Natalia Bidart on 2016-11-04

Checkpoint.

1440. By Natalia Bidart on 2016-11-04

Closer.

1441. By Natalia Bidart on 2018-03-08

Merged trunk in.

1442. By Natalia Bidart on 2018-03-08

Fixed typo.

1443. By Natalia Bidart on 2018-03-08

Merged trunk in.

1444. By Natalia Bidart on 2018-03-08

Merged trunk in.

1445. By Natalia Bidart on 2018-03-08

Merged simpler-setup-py into clean-pos-ins.

1446. By Natalia Bidart on 2018-04-14

Merged trunk in.

Unmerged revisions

1446. By Natalia Bidart on 2018-04-14

Merged trunk in.

1445. By Natalia Bidart on 2018-03-08

Merged simpler-setup-py into clean-pos-ins.

1444. By Natalia Bidart on 2018-03-08

Merged trunk in.

1443. By Natalia Bidart on 2018-03-08

Merged trunk in.

1442. By Natalia Bidart on 2018-03-08

Fixed typo.

1441. By Natalia Bidart on 2018-03-08

Merged trunk in.

1440. By Natalia Bidart on 2016-11-04

Closer.

1439. By Natalia Bidart on 2016-11-04

Checkpoint.

1438. By Natalia Bidart on 2016-10-25

Merged no-pos into clean-pos-ins.

1437. By Natalia Bidart on 2016-10-24

Merged no-pos into clean-pos-ins.

=== modified file '.bzrignore'
--- .bzrignore	2016-10-24 20:59:39 +0000
+++ .bzrignore	2018-04-14 23:11:29 +0000
@@ -12,6 +12,4 @@
 
 .env
 .protocol
-clientdefs.py
-logging.conf
 ubuntuone/storageprotocol

=== modified file 'bin/u1sdtool'
--- bin/u1sdtool	2013-01-28 17:43:24 +0000
+++ bin/u1sdtool	2018-04-14 23:11:29 +0000
@@ -90,7 +90,7 @@
         if should_start:
             yield sync_daemon_tool.start()
         yield run(options, sync_daemon_tool, out)
-    except Exception, e:
+    except Exception as e:
         out.write("\nOops, an error ocurred:\n%s\n" % e)
     finally:
         if reactor.running:

=== modified file 'bin/ubuntuone-launch'
--- bin/ubuntuone-launch	2015-09-29 21:05:26 +0000
+++ bin/ubuntuone-launch	2018-04-14 23:11:29 +0000
@@ -68,7 +68,7 @@
 from gi.repository import GLib
 from twisted.internet import defer
 
-from ubuntuone.syncdaemon.config import get_user_config
+from ubuntuone.config import get_user_config
 from ubuntuone.platform.tools import SyncDaemonTool, is_already_running
 
 
@@ -89,8 +89,8 @@
     if not running:
         # have SD start
         yield sync_daemon_tool.start()
-        yield sync_daemon_tool.wait_for_signal('StatusChanged',
-                lambda a: a.get('name', '') == 'READY')
+        yield sync_daemon_tool.wait_for_signal(
+            'StatusChanged', lambda a: a.get('name', '') == 'READY')
 
 
 if __name__ == '__main__':

=== modified file 'bin/ubuntuone-syncdaemon'
--- bin/ubuntuone-syncdaemon	2017-02-10 01:15:07 +0000
+++ bin/ubuntuone-syncdaemon	2018-04-14 23:11:29 +0000
@@ -29,46 +29,33 @@
 # files in the program, then also delete it here.
 """Storage synchronization daemon."""
 
+import atexit
+import logging
+import signal
 import sys
 
-if sys.platform not in ('win32', 'darwin'):
+if sys.platform not in ('win32', 'darwin'):  # noqa
     from twisted.internet import gireactor
     gireactor.install()
     from dbus.mainloop.glib import DBusGMainLoop
     DBusGMainLoop(set_as_default=True)
 
-
-import atexit
-import os
-import signal
-import sys
-
+from ubuntuone import config
 from ubuntuone.platform import (
-    can_write,
-    set_dir_readwrite,
     is_already_running,
     is_root,
-    make_dir,
-    path_exists,
-    recursive_move,
     set_application_name,
 )
 from ubuntuone.platform.filesystem_notifications.monitor import (
     get_filemonitor_class,
 )
-
-from ubuntuone.syncdaemon import logger, config
-from ubuntuone.syncdaemon.config import (
-    get_config_files,
-)
-
+from ubuntuone.syncdaemon import config
 from ubuntuone.syncdaemon.main import Main
 
 from twisted.internet import reactor, defer
-from dirspec.basedir import (
-    xdg_cache_home,
-    xdg_data_home,
-)
+
+
+logger = logging.getLogger(__name__)
 
 
 class DeathException(Exception):
@@ -77,7 +64,7 @@
 
 def die(msg):
     """Write the error message an die."""
-    logger.root_logger.warning(msg)
+    logger.warning(msg)
     sys.stderr.write(msg + '\n')
     raise DeathException()
 
@@ -96,18 +83,19 @@
     while len(args) > 0 and not args[0].startswith('-'):
         configs.append(args.pop(0))
     if len(configs) == 0:
-        configs.extend(get_config_files())
-    (parser, options, argv) = config.configglue(file(configs[0]), *configs[1:],
-                                                args=args, usage=usage)
+        configs.extend(config.get_config_files())
+    with open(configs[0]) as f:
+        parser, options, argv = config.configglue(f, *configs[1:],
+                                                  args=args, usage=usage)
     d = async_main(parser, options, argv)
     d.addErrback(check_death)
-    d.addErrback(logger.root_logger.exception)
+    d.addErrback(logger.exception)
 
     # check if we should start a twisted manhole
     if options.debug_manhole:
         startManhole()
     else:
-        logger.root_logger.info('not starting twisted.manhole')
+        logger.info('not starting twisted.manhole')
 
     if options.debug_lsprof_file:
         try:
@@ -115,7 +103,7 @@
             ret, stats = profile(reactor.run)
             stats.save(options.debug_lsprof_file)
         except ImportError:
-            logger.root_logger.warning('bzrlib.lsprof not available')
+            logger.warning('bzrlib.lsprof not available')
             reactor.run()
     else:
         reactor.run()
@@ -127,9 +115,9 @@
         from twisted.cred.portal import Portal
         from twisted.cred.checkers import InMemoryUsernamePasswordDatabaseDontUse
     except ImportError:
-        logger.root_logger.warning('twisted.manhole not available')
+        logger.warning('twisted.manhole not available')
     else:
-        logger.root_logger.info('starting twisted.manhole')
+        logger.info('starting twisted.manhole')
         realm = manhole_ssh.TerminalRealm()
         getManhole = lambda _: manhole.Manhole(globals())
         realm.chainedProtocolFactory.protocolFactory = getManhole
@@ -138,19 +126,23 @@
         portal.registerChecker(checker)
         manholeFactory = manhole_ssh.ConchFactory(portal)
         reactor.listenTCP(2222, manholeFactory)
-        logger.root_logger.info('twisted.manhole started')
+        logger.info('twisted.manhole started')
 
 
 @defer.inlineCallbacks
 def async_main(parser, options, argv):
     """The client entry point that can yield."""
-    logger.init()
-    if options.debug:
-        logger.set_debug('stdout file')
+    logs_dir = config.get_logs_dir()
+    if options.debug or os.environ.get("MAGICICADA_DEBUG", None):
+        level = logging.DEBUG
+        dest = 'stdout file'
     else:
-        logger.configure_logging(options.logging_level,
-                                 options.logging_file_size,
-                                 options.logging_backup_count)
+        level = options.logging_level
+        dest = ''
+    logger.init(
+        logs_dir=logs_dir, level=level, dest=dest,
+        file_size=options.logging_file_size,
+        backup_count=options.logging_backup_count)
 
     # check we're not running as root, or have explicitely and in
     # length expressed our desire to do so
@@ -171,37 +163,7 @@
     if is_running:
         die('Another instance is running')
 
-    # check if we are using xdg_data_home and it doesn't exists
-    if xdg_data_home in options.data_dir and \
-       not path_exists(options.data_dir):
-        # if we have metadata in the old xdg_cache, move it!
-        old_data_dir = options.data_dir.replace(xdg_data_home, xdg_cache_home)
-        if path_exists(old_data_dir):
-            parent = os.path.dirname(options.data_dir)
-            if path_exists(parent) and not can_write(parent):
-                # make the parent dir writable
-                set_dir_readwrite(parent)
-            elif not path_exists(parent):
-                # if it don't exits
-                make_dir(parent, recursive=True)
-            recursive_move(old_data_dir, options.data_dir)
-    if not path_exists(options.data_dir):
-        parent = os.path.dirname(options.data_dir)
-        if path_exists(parent) and not can_write(parent):
-            # make the parent dir writable
-            set_dir_readwrite(parent)
-        make_dir(options.data_dir, recursive=True)
-
-    # create the partials_dir
-    partials_dir = os.path.join(xdg_cache_home, 'ubuntuone', 'partials')
-    if not path_exists(partials_dir):
-        make_dir(partials_dir, recursive=True)
-
-    logger.rotate_logs()
-
-    assert isinstance(options.root_dir, str)
-    assert isinstance(options.shares_dir, str)
-    assert isinstance(options.data_dir, str)
+    dirs = config.get_or_create_dirs()
 
     # check if we have auth credentials
     auth_credentials = None
@@ -218,28 +180,28 @@
     # check which file monitor to use
     monitor_class = yield get_filemonitor_class(options.fs_monitor)
 
-    main = Main(options.root_dir, options.shares_dir, options.data_dir,
-                partials_dir, options.server,
-                mark_interval=options.mark_interval,
-                broadcast_events=options.send_events_over_dbus,
-                handshake_timeout=options.handshake_timeout,
-                shares_symlink_name='Shared With Me',
-                read_limit=options.bandwidth_throttling_read_limit,
-                write_limit=options.bandwidth_throttling_write_limit,
-                throttling_enabled=options.bandwidth_throttling_on,
-                ignore_files=options.ignore,
-                auth_credentials=auth_credentials,
-                monitor_class=monitor_class)
+    syncdaemon_main = Main(
+        host=options.host, port=int(options.port), dns_srv=options.dns_srv,
+        ssl=True, disable_ssl_verify=options.disable_ssl_verify,
+        mark_interval=options.mark_interval,
+        broadcast_events=options.send_events_over_dbus,
+        handshake_timeout=options.handshake_timeout,
+        shares_symlink_name='Shared With Me',
+        read_limit=options.bandwidth_throttling_read_limit,
+        write_limit=options.bandwidth_throttling_write_limit,
+        throttling_enabled=options.bandwidth_throttling_on,
+        ignore_files=options.ignore, auth_credentials=auth_credentials,
+        monitor_class=monitor_class, **dirs)
 
     # override the reactor default signal handlers in order to
     # shutdown properly
-    atexit.register(reactor.callFromThread, main.quit)
+    atexit.register(reactor.callFromThread, syncdaemon_main.quit)
 
     def install_handlers():
         """ install our custom signal handler. """
         def handler(signum, frame):
-            logger.root_logger.debug("Signal received %s ", str(signum))
-            reactor.callFromThread(main.quit)
+            logger.debug("Signal received %s ", str(signum))
+            reactor.callFromThread(syncdaemon_main.quit)
         for signal_name in ['SIGHUP', 'SIGTERM', 'SIGINT']:
             actual_signal = getattr(signal, signal_name, None)
             # some platforms do not have all the signals, eg: Windows does not
@@ -256,17 +218,18 @@
         try:
             import guppy.heapy.RM
         except ImportError:
-            logger.root_logger.warning('guppy-pe/heapy not available, remote '
-                                       'monitor thread not started')
+            logger.warning(
+                'guppy-pe/heapy not available, remote monitor thread not '
+                'started')
         else:
             guppy.heapy.RM.on()
 
-    main.start()
+    syncdaemon_main.start()
 
 
 if __name__ == '__main__':
     try:
         main(sys.argv)
     except Exception:
-        logger.root_logger.exception('Unexpected error')
+        logger.exception('Unexpected error while starting:')
         raise

=== removed file 'contrib/__init__.py'
--- contrib/__init__.py	2012-04-09 20:07:05 +0000
+++ contrib/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# contrib - Extra required code to build/install the client
-#
-# Author: Rodney Dawes <[e-mail]>
-#
-# Copyright 2009-2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Extra things we need to build, test, or install the client."""

=== modified file 'contrib/dbus-docs'
--- contrib/dbus-docs	2013-01-28 17:43:24 +0000
+++ contrib/dbus-docs	2018-04-14 23:11:29 +0000
@@ -41,13 +41,7 @@
 sys.path.insert(0, os.path.abspath("."))
 
 from contrib.dbus_util import DBusRunner
-from contrib.testing.testcase import (
-    FakeMain, 
-    DBusGMainLoop, 
-    DBusInterface, 
-    FakeNetworkManager,
-)
-
+from ubuntuone import config
 from ubuntuone.platform.dbus_interface import (
     DBUS_IFACE_SYNC_NAME,
     DBUS_IFACE_STATUS_NAME,
@@ -59,6 +53,12 @@
     DBUS_IFACE_PUBLIC_FILES_NAME,
 )
 from ubuntuone.platform.tools import DBusClient
+from ubuntuone.testing.testcase import (
+    FakeMain, 
+    DBusGMainLoop, 
+    DBusInterface, 
+    FakeNetworkManager,
+)
 from twisted.internet import reactor, defer
 
 
@@ -173,11 +173,8 @@
 def start_syncdaemon(tmp_dir):
     """Starts a syncdaemon instance just like the one used in the test suite"""
     xdg_cache = os.path.join(tmp_dir, 'xdg_cache')
-    data_dir = os.path.join(xdg_cache, 'data')
-    partials_dir = os.path.join(xdg_cache, 'partials')
-    root_dir = os.path.join(tmp_dir, 'root')
-    shares_dir = os.path.join(tmp_dir, 'shares')
-    main = FakeMain(root_dir, shares_dir, data_dir, partials_dir)
+    dirs = config.get_or_create_dirs(prefix=xdg_cache)
+    main = FakeMain(**dirs)
     loop = DBusGMainLoop(set_as_default=True)
     bus = dbus.bus.BusConnection(mainloop=loop)
     nm = FakeNetworkManager(bus)

=== modified file 'contrib/dump_metadata.py'
--- contrib/dump_metadata.py	2012-06-21 18:58:50 +0000
+++ contrib/dump_metadata.py	2018-04-14 23:11:29 +0000
@@ -39,15 +39,7 @@
 import os
 import sys
 
-from ubuntuone.syncdaemon import (
-    filesystem_manager,
-    tritcask,
-    volume_manager,
-)
-from dirspec.basedir import (
-    xdg_cache_home,
-    xdg_data_home,
-)
+from ubuntuone.syncdaemon import volume_manager
 
 
 class FakeVM(object):
@@ -85,8 +77,10 @@
     tritcask_dir = os.path.join(data_dir, 'tritcask')
     db = tritcask.Tritcask(tritcask_dir)
     vm = FakeVM(data_dir, db)
-    partials_dir = os.path.join(xdg_cache_home, 'ubuntuone', 'partials')
-    fsm = filesystem_manager.FileSystemManager(data_dir, partials_dir, vm, db)
+    filesync_main = Main(
+        root_dir, shares_dir, data_dir, vm_class=FakeVM)
+    vm = filesync_main.vm
+    fsm = filesync_main.fs
 
     shares = []
     root = None
@@ -156,11 +150,11 @@
 
 if __name__ == "__main__":
     if len(sys.argv) == 1:
-        basedir = os.path.join(xdg_data_home, 'ubuntuone', 'syncdaemon')
+        data_dir = None
     elif len(sys.argv) == 2:
-        basedir = sys.argv[1]
+        data_dir = sys.argv[1]
     else:
         print __doc__
         sys.exit()
 
-    main(basedir)
+    main(data_dir)

=== removed file 'data/com.ubuntuone.SyncDaemon.service.in'
--- data/com.ubuntuone.SyncDaemon.service.in	2009-06-17 16:08:17 +0000
+++ data/com.ubuntuone.SyncDaemon.service.in	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=com.ubuntuone.SyncDaemon
-Exec=@libexecdir@/ubuntuone-syncdaemon
-

=== added file 'data/logging.conf'
--- data/logging.conf	1970-01-01 00:00:00 +0000
+++ data/logging.conf	2018-04-14 23:11:29 +0000
@@ -0,0 +1,12 @@
+[logging]
+level.default = INFO
+level.parser = log_level
+level.help = Set the log level (TRACE, DEBUG, INFO, WARNING, ERROR, NOTE CRITICAL, FATAL)
+
+file_size.default = 1048576
+file_size.parser = int
+file_size.help = max file size (the file will be rotated)
+
+backup_count.default = 5
+backup_count.parser = int
+backup_count.help = number of rotated log files to keep around.

=== removed file 'data/logging.conf.in'
--- data/logging.conf.in	2009-12-23 22:05:44 +0000
+++ data/logging.conf.in	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[logging]
-level.default = @LOG_LEVEL@
-level.parser = log_level
-level.help = Set the log level (TRACE, DEBUG, INFO, WARNING, ERROR, NOTE 
-    CRITICAL, FATAL)
-
-file_size.default = @LOG_FILE_SIZE@
-file_size.parser = int
-file_size.help = max file size (the file will be rotated)
-
-backup_count.default = 5
-backup_count.parser = int
-backup_count.help = number of rotated log files to keep around.

=== removed file 'data/source_ubuntuone-client.py'
--- data/source_ubuntuone-client.py	2013-01-31 20:35:21 +0000
+++ data/source_ubuntuone-client.py	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-# Copyright 2009-2013 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Stub for Apport"""
-
-from __future__ import print_function, unicode_literals
-
-import apport
-import os
-
-from apport.hookutils import attach_file_if_exists
-from dirspec.basedir import xdg_cache_home, xdg_config_home
-
-# Paths where things we might want live
-u1_log_path = os.path.join(xdg_cache_home, b"ubuntuone", b"log")
-u1_user_config_path = os.path.join(xdg_config_home, b"ubuntuone")
-# things we may want to collect for the report
-u1_client_log = os.path.join(u1_log_path, b"syncdaemon.log")
-u1_except_log = os.path.join(u1_log_path, b"syncdaemon-exceptions.log")
-u1_invalidnames_log = os.path.join(u1_log_path, b"syncdaemon-invalid-names.log")
-u1_sd_conf = os.path.join(b"etc", b"xdg", b"ubuntuone", b"syncdaemon.conf")
-u1_usersd_conf = os.path.join(u1_user_config_path, b"syncdaemon.conf")
-
-
-def add_info(report):
-    """add report info"""
-    attach_file_if_exists(report, u1_except_log,
-                                  "UbuntuOneSyncdaemonExceptionsLog")
-    attach_file_if_exists(report, u1_invalidnames_log,
-                                  "UbuntuOneSyncdaemonInvalidNamesLog")
-    attach_file_if_exists(report, u1_usersd_conf,
-                                  "UbuntuOneUserSyncdaemonConfig")
-    attach_file_if_exists(report, u1_sd_conf,
-                                  "UbuntuOneSyncdaemonConfig")
-
-    if not apport.packaging.is_distro_package(report['Package'].split()[0]):
-        report['ThirdParty'] = 'True'
-        report['CrashDB'] = 'ubuntuone'

=== removed file 'data/syncdaemon-dev.conf'
--- data/syncdaemon-dev.conf	2009-06-18 19:01:02 +0000
+++ data/syncdaemon-dev.conf	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[__main__]
-data_dir.default = tmp/syncdaemon/data
-# override the parser to allow using arbritary locations instead of xdg based paths
-data_dir.parser = home_dir 
-
-# In development don't lookup the SRV records 
-dns_srv.default = 
-
-# In development don't verify the SSL certificate.
-disable_ssl_verify = True
-

=== modified file 'data/syncdaemon.conf'
--- data/syncdaemon.conf	2017-02-22 16:48:48 +0000
+++ data/syncdaemon.conf	2018-04-14 23:11:29 +0000
@@ -10,18 +10,6 @@
 files_sync_enabled.parser = bool
 files_sync_enabled.help = Toggles synchronization of files (False disables syncdaemon entirely)
 
-root_dir.default = ~/Magicicada
-root_dir.parser = home_dir
-root_dir.help = Use the specified directory as the root
-
-shares_dir.default = ubuntuone/shares
-shares_dir.parser = xdg_data
-shares_dir.help = Use the specified directory as shares root
-
-data_dir.default = ubuntuone/syncdaemon
-data_dir.parser = xdg_data
-data_dir.help = Use the specified directory to store the metadata
-
 auth.help = Explicitly provide Auth credentials (username and password)
 auth.metavar = USERNAME:PASSWORD
 

=== removed file 'data/ubuntuone-client-crashdb.conf'
--- data/ubuntuone-client-crashdb.conf	2009-08-05 18:01:19 +0000
+++ data/ubuntuone-client-crashdb.conf	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-ubuntuone = {
-        'impl' : 'launchpad',
-        'project' : 'ubuntuone-client',
-        'bug_pattern_base' : None,
-}

=== removed file 'data/ubuntuone-launch.desktop.in'
--- data/ubuntuone-launch.desktop.in	2015-09-29 02:25:44 +0000
+++ data/ubuntuone-launch.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Magicicada
-Exec=/bin/sh -c '[ -d "$HOME/Magicicada" ] && ubuntuone-launch'
-Type=Application
-X-GNOME-Autostart-Delay=30
-Icon=ubuntuone
-Comment= 
-NoDisplay=true

=== removed file 'setup.cfg'
--- setup.cfg	2013-06-07 15:22:31 +0000
+++ setup.cfg	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[build_i18n]
-desktop_files=[("etc/xdg/autostart", ("data/ubuntuone-launch.desktop.in",))]

=== modified file 'setup.py'
--- setup.py	2018-03-14 21:01:56 +0000
+++ setup.py	2018-04-14 23:11:29 +0000
@@ -30,214 +30,29 @@
 """Setup.py: build, distribute, clean."""
 
 import os
-import sys
-
-try:
-    from DistUtilsExtra.command import build_extra, build_i18n
-    import DistUtilsExtra.auto
-except ImportError:
-    print >> sys.stderr, 'To build this program you need '\
-                         'https://launchpad.net/python-distutils-extra'
-    raise
-assert DistUtilsExtra.auto.__version__ >= '2.18', \
-    'needs DistUtilsExtra.auto >= 2.18'
-
-
-PROJECT_NAME = 'magicicada-client'
-VERSION = '1.0'
-
-POT_FILE = 'po/%s.pot' % PROJECT_NAME
-SERVICE_FILES = ['data/com.ubuntuone.Credentials.service',
-                 'data/com.ubuntuone.SyncDaemon.service']
-CONFIG_FILES = ['data/logging.conf']
-CLIENTDEFS = 'ubuntuone/clientdefs.py'
-
-BUILD_FILES = [CLIENTDEFS] + CONFIG_FILES
-CLEANFILES = [POT_FILE, 'MANIFEST'] + BUILD_FILES + SERVICE_FILES
-
-if int(VERSION.split('.')[1]) % 2 != 0:
-    LOG_LEVEL = 'DEBUG'
-    LOG_FILE_SIZE = '10485760'
-else:
-    LOG_LEVEL = 'INFO'
-    LOG_FILE_SIZE = '1048576'
-
-
-def replace_variables(files_to_replace, prefix=None, *args, **kwargs):
-    """Replace the @VERSION@ in the constants file with the actual version."""
-    for fname in files_to_replace:
-        with open(fname + '.in') as in_file:
-            content = in_file.read()
-            with open(fname, 'w') as out_file:
-                content = content.replace('@VERSION@', VERSION)
-                content = content.replace('@PROJECT_NAME@', PROJECT_NAME)
-                content = content.replace('@GETTEXT_PACKAGE@', PROJECT_NAME)
-                content = content.replace('@LOG_LEVEL@', LOG_LEVEL)
-                content = content.replace('@LOG_FILE_SIZE@', LOG_FILE_SIZE)
-                if prefix is not None:
-                    content = content.replace(
-                        '@localedir@', os.path.join(prefix,
-                                                    'share', 'locale'))
-                    content = content.replace(
-                        '@libexecdir@', os.path.join(prefix,
-                                                     'lib', PROJECT_NAME))
-                out_file.write(content)
-
-
-class Install(DistUtilsExtra.auto.install_auto):
+
+from distutils.command.build import build
+from distutils.command.clean import clean
+from setuptools import Command, find_packages, setup
+from setuptools.command.install import install
+
+from ubuntuone.clientdefs import PROJECT_NAME, VERSION
+
+
+class Install(install):
     """Class to install proper files."""
 
     def run(self):
-        """Do the install.
-
-        Read from *.service.in and generate .service files by replacing
-        @prefix@ by self.prefix.
-
-        """
-
-        # Remove the contrib and tests packages from the packages list
-        # as they are not meant to be installed to the system.
-        pkgs = [x for x in self.distribution.packages if not (
-            x.startswith('contrib') or x.startswith('tests'))]
-        self.distribution.packages = pkgs
-
-        # Remove the input and dev files from the data files list,
-        # as they are not meant to be installed.
-        data_files = [x for x in self.distribution.data_files if not (
-            x[1][0].endswith('.in') or x[1][0].endswith('-dev.conf'))]
-        self.distribution.data_files = data_files
-
+        """Do the install."""
         # Get just the prefix value, without the root
         prefix = self.install_data.replace(
             self.root if self.root is not None else '', '')
-        replace_variables(SERVICE_FILES, prefix)
-        DistUtilsExtra.auto.install_auto.run(self)
-        # Replace the CLIENTDEFS paths here, so that we can do it directly in
-        # the installed copy, rather than the lcoal copy. This allows us to
-        # have a semi-generated version for use in tests, and a full version
-        # for use in installed systems.
-        with open(CLIENTDEFS) as in_file:
-            content = in_file.read()
-            with open(os.path.join(self.install_purelib,
-                                   PROJECT_NAME,
-                                   CLIENTDEFS), 'w') as out_file:
-                content = content.replace(
-                    '@localedir@', os.path.join(prefix, 'share', 'locale'))
-                content = content.replace(
-                    '@libexecdir@', os.path.join(prefix, 'lib', PROJECT_NAME))
-                out_file.write(content)
-
-
-class Build(build_extra.build_extra):
-    """Build PyQt (.ui) files and resources."""
-
-    description = "build PyQt GUIs (.ui) and resources (.qrc)"
-
-    def run(self):
-        """Execute the command."""
-        replace_variables(BUILD_FILES)
-        build_extra.build_extra.run(self)
-
-
-class Clean(DistUtilsExtra.auto.clean_build_tree):
-    """Class to clean up after the build."""
-
-    def run(self):
-        """Clean up the built files."""
-        for built_file in CLEANFILES:
-            if os.path.exists(built_file):
-                os.unlink(built_file)
-
-        DistUtilsExtra.auto.clean_build_tree.run(self)
-
-
-class BuildLocale(build_i18n.build_i18n):
-    """Work around a bug in DistUtilsExtra."""
-
-    def run(self):
-        """Magic."""
-        build_i18n.build_i18n.run(self)
-        i = 0
-        for df in self.distribution.data_files:
-            if df[0].startswith('etc/xdg/'):
-                if sys.platform not in ('darwin', 'win32'):
-                    new_df = (df[0].replace('etc/xdg/', '/etc/xdg/'), df[1])
-                    self.distribution.data_files[i] = new_df
-                else:
-                    self.distribution.data_files.pop(i)
-            i += 1
-
-
-def set_py2exe_paths():
-    """Set the path so that py2exe finds the required modules."""
-    # Pylint does not understand same spaced imports
-    import win32com
-    try:
-        import py2exe.mf as modulefinder
-    except ImportError:
-        import modulefinder
-
-    # py2exe 0.6.4 introduced a replacement modulefinder.
-    # This means we have to add package paths there,
-    # not to the built-in one.  If this new modulefinder gets
-    # integrated into Python, then we might be able to revert
-    # this some day. If this doesn't work, try import modulefinder
-    for package_path in win32com.__path__[1:]:
-        modulefinder.AddPackagePath("win32com", package_path)
-    for extra_mod in ["win32com.server", "win32com.client"]:
-        __import__(extra_mod)
-        module = sys.modules[extra_mod]
-        for module_path in module.__path__[1:]:
-            modulefinder.AddPackagePath(extra_mod, module_path)
-
-
-cmdclass = {
-    'install': Install,
-    'build': Build,
-    'clean': Clean,
-    'build_i18n': BuildLocale,
-}
-
-bin_scripts = [
-    'bin/u1sdtool',
-    'bin/ubuntuone-launch',
-]
-
-libexec_scripts = [
-    'bin/ubuntuone-syncdaemon',
-]
-
-data_files = []
-scripts = []
-
-if sys.platform == 'win32':
-    set_py2exe_paths()
-    extra = {
-        'options': {
-            'py2exe': {
-                'bundle_files': 1,
-                'skip_archive': 0,
-                'optimize': 1,
-                'dll_excludes': ["mswsock.dll", "powrprof.dll"],
-            },
-        },
-        # add the console script so that py2exe compiles it
-        'console': bin_scripts + libexec_scripts,
-        'zipfile': None,
-    }
-else:
-    data_files.extend([
-        ('lib/%s' % PROJECT_NAME, libexec_scripts),
-        ('share/dbus-1/services', SERVICE_FILES),
-        ('/etc/xdg/ubuntuone', CONFIG_FILES + ['data/syncdaemon.conf']),
-        ('/etc/apport/crashdb.conf.d', ['data/ubuntuone-client-crashdb.conf']),
-        ('share/apport/package-hooks', ['data/source_ubuntuone-client.py']),
-        ('share/man/man1', ['docs/man/u1sdtool.1']),
-    ])
-    scripts.extend(bin_scripts)
-    extra = {}
-
-DistUtilsExtra.auto.setup(
+        if prefix:
+            print "Will install on prefix is", prefix
+
+        install.run(self)
+
+setup(
     name=PROJECT_NAME,
     version=VERSION,
     license='GPL v3',
@@ -246,7 +61,18 @@
     description='Magicicada file synchronization client',
     url='https://launchpad.net/%s' % PROJECT_NAME,
     extra_path=PROJECT_NAME,
-    scripts=scripts,
-    data_files=data_files,
-    cmdclass=cmdclass,
-    **extra)
+    packages=find_packages(),
+    package_data={
+        '':  ['data/*'],
+    },
+    exclude_package_data={
+        '': ['contrib', '*.in'],
+    },
+    scripts=['bin/u1sdtool', 'bin/ubuntuone-syncdaemon',
+             'bin/ubuntuone-proxy-tunnel'],
+    data_files=[
+        ('share/dbus-1/services', ['data/com.ubuntuone.SyncDaemon.service']),
+        ('share/data', ['data/logging.conf', 'data/syncdaemon.conf']),
+        ('share/man/man1', ['docs/man/u1sdtool.1']),
+    ],
+)

=== renamed file 'ubuntuone/clientdefs.py.in' => 'ubuntuone/clientdefs.py'
--- ubuntuone/clientdefs.py.in	2016-06-04 23:41:52 +0000
+++ ubuntuone/clientdefs.py	2018-04-14 23:11:29 +0000
@@ -1,8 +1,6 @@
-# ubuntuone.clientdefs - Configure-time definitions
-#
-# Author: David Planella <[e-mail]>
-#
-# Copyright 2009-2012 Canonical Ltd.
+#
+# Copyright 2009-2015 Canonical Ltd.
+# Copyright 2005-2016 Chicharreros
 #
 # 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
@@ -28,25 +26,21 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Configure-time definitions for the client."""
+
+"""Definitions for the client."""
 
 import gettext
-import os
 import platform
 import urllib
 
 NAME = 'Magicicada'
-VERSION = "@VERSION@"
-LOCALEDIR = "@localedir@"
-LIBEXECDIR = "@libexecdir@"
-GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"
-PROJECT_NAME = "@GETTEXT_PACKAGE@"
-PROJECT_DIR = os.path.join('@prefix@', 'share', PROJECT_NAME)
-BIN_DIR = os.path.join('@prefix@', 'lib', PROJECT_NAME)
+VERSION = '1.0'
+PROJECT_NAME = 'magicicada-client'
+GETTEXT_PACKAGE = PROJECT_NAME
 
 
 def Q_(string):
-    return gettext.dgettext(GETTEXT_PACKAGE, string)
+    return gettext.dgettext(PROJECT_NAME, string)
 
 
 def platform_data():

=== renamed file 'ubuntuone/syncdaemon/config.py' => 'ubuntuone/config.py'
--- ubuntuone/syncdaemon/config.py	2018-03-14 21:55:27 +0000
+++ ubuntuone/config.py	2018-04-14 23:11:29 +0000
@@ -1,5 +1,3 @@
-# ubuntuone.syncdaemon.config - SyncDaemon config utilities
-#
 # Copyright 2009-2012 Canonical Ltd.
 # Copyright 2017 Chicharreros (https://launchpad.net/~chicharreros)
 #
@@ -37,15 +35,16 @@
 
 from ConfigParser import NoOptionError, NoSectionError
 from optparse import OptionParser
-from dirspec.basedir import (
-    load_config_paths,
-    save_config_path,
-    xdg_data_home,
-    xdg_cache_home,
+from dirspec.basedir import xdg_cache_home, xdg_data_home, save_config_path
+
+from ubuntuone.platform import (
+    can_write,
+    expand_user,
+    make_dir,
+    path_exists,
+    set_dir_readwrite,
 )
-from dirspec.utils import unicode_path
 
-from ubuntuone.platform import expand_user
 
 # the try/except is to work with older versions of configglue (that
 # had everything that is now configglue.inischema.* as configglue.*).
@@ -91,42 +90,46 @@
 _user_config = None
 
 
-def path_from_unix(path):
-    return path.replace('/', os.path.sep)
-
-
-def home_dir_parser(value):
-    """Parser for the root_dir and shares_dir options.
-
-    Return the path using user home + value.
-
-    """
-    path = path_from_unix(value)
-    result = expand_user(path)
-    assert isinstance(result, str)
-    return result
-
-
-def xdg_cache_dir_parser(value):
-    """Parser for the data_dir option.
-
-    Return the path using xdg_cache_home + value.
-
-    """
-    result = os.path.join(xdg_cache_home, path_from_unix(value))
-    assert isinstance(result, str)
-    return result
-
-
-def xdg_data_dir_parser(value):
-    """Parser for the data_dir option.
-
-    Return the path using xdg_data_home + value.
-
-    """
-    result = os.path.join(xdg_data_home, path_from_unix(value))
-    assert isinstance(result, str)
-    return result
+def get_or_create_dirs(prefix=None):
+    if prefix is not None:
+        data_dir = os.path.join(prefix, 'data')
+        cache_dir = os.path.join(prefix, 'cache')
+        root_dir = os.path.join(prefix, 'Magicicada')
+    else:
+        root_dir = expand_user('~/Magicicada')
+        data_dir = xdg_data_home
+        cache_dir = xdg_cache_home
+
+    if not path_exists(data_dir):
+        parent = os.path.dirname(data_dir)
+        if path_exists(parent) and not can_write(parent):
+            # make the parent dir writable
+            set_dir_readwrite(parent)
+        make_dir(data_dir, recursive=True)
+
+    if not path_exists(cache_dir):
+        make_dir(cache_dir, recursive=True)
+
+    # create the logs_dir
+    logs_dir = os.path.join(data_dir, 'magicicada', 'logs')
+    if not path_exists(shares_dir):
+        make_dir(logs_dir, recursive=True)
+
+    # create the shares_dir
+    shares_dir = os.path.join(data_dir, 'magicicada', 'shares')
+    if not path_exists(shares_dir):
+        make_dir(shares_dir, recursive=True)
+
+    # create the partials_dir
+    partials_dir = os.path.join(cache_dir, 'magicicada', 'partials')
+    if not path_exists(partials_dir):
+        make_dir(partials_dir, recursive=True)
+        # ensure that we can write in the partials_dir
+        set_dir_readwrite(partials_dir)
+
+    return dict(
+        root_dir=root_dir, shares_dir=shares_dir, partials_dir=partials_dir,
+        data_dir=data_dir, cache_dir=cache_dir, logs_dir=logs_dir)
 
 
 def server_connection_parser(value):
@@ -190,42 +193,25 @@
 
 def get_parsers():
     """returns a list of tuples: (name, parser)"""
-    return [('home_dir', home_dir_parser),
-            ('xdg_cache', xdg_cache_dir_parser),
-            ('xdg_data', xdg_data_dir_parser),
-            ('log_level', log_level_parser),
-            ('connection', server_connection_parser),
+    return [('log_level', log_level_parser),
             ('throttling_limit', throttling_limit_parser)]
 
 
 def get_config_files():
-    """ return the path to the config files or and empty list.
-    The search path is based on the paths returned by load_config_paths
-    but it's returned in reverse order (e.g: /etc/xdg first).
-    """
+    """Return the path to the config files or and empty list."""
     config_files = []
-    for xdg_config_dir in load_config_paths('ubuntuone'):
-        xdg_config_dir = unicode_path(xdg_config_dir)
-        config_file = os.path.join(xdg_config_dir, CONFIG_FILE).encode('utf8')
-        if os.path.exists(config_file):
-            config_files.append(config_file)
-
-        config_logs = os.path.join(xdg_config_dir, CONFIG_LOGS).encode('utf8')
-        if os.path.exists(config_logs):
-            config_files.append(config_logs)
-
-    # reverse the list as load_config_paths returns the user dir first
-    config_files.reverse()
-    # if we are running from a branch, get the config files from it too
-    config_file = os.path.join(os.path.dirname(__file__), os.path.pardir,
-                               os.path.pardir, 'data', CONFIG_FILE)
-    if os.path.exists(config_file):
-        config_files.append(config_file)
-
-    config_logs = os.path.join(os.path.dirname(__file__), os.path.pardir,
-                               os.path.pardir, 'data', CONFIG_LOGS)
-    if os.path.exists(config_logs):
-        config_files.append(config_logs)
+
+    # if we are running from a branch or, get the config files from it too
+    local_data = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir,
+                     'share', 'data'))
+    if not os.path.exists(local_data):
+        local_data = os.path.abspath(os.path.join(
+            os.path.dirname(__file__), os.path.pardir, os.path.pardir, 'data'))
+
+    if os.path.exists(local_data):
+        config_files.append(os.path.join(local_data, CONFIG_FILE))
+        config_files.append(os.path.join(local_data, CONFIG_LOGS))
 
     return config_files
 

=== modified file 'ubuntuone/logger.py'
--- ubuntuone/logger.py	2015-09-19 23:15:50 +0000
+++ ubuntuone/logger.py	2018-04-14 23:11:29 +0000
@@ -1,8 +1,5 @@
-# ubuntuone.syncdaemon.logger - logging utilities
-#
-# Author: Guillermo Gonzalez <[e-mail]>
-#
 # Copyright 2010-2012 Canonical Ltd.
+# Copyright 2015-2016 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # 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
@@ -28,16 +25,19 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Ubuntuone client logging utilities and config. """
+
+"""Logging utilities and config. """
 
 from __future__ import with_statement
 
 import contextlib
 import functools
 import logging
+import os
 import re
 import sys
 import weakref
+import zlib
 
 from logging.handlers import TimedRotatingFileHandler
 
@@ -69,22 +69,22 @@
 
 
 class DayRotatingFileHandler(TimedRotatingFileHandler):
-    """A mix of TimedRotatingFileHandler and RotatingFileHandler configured for
-    daily rotation but that uses the suffix and extMatch of Hourly rotation, in
-    order to allow seconds based rotation on each startup.
-    The log file is also rotated when the specified size is reached.
+    """A mix of TimedRotatingFileHandler and RotatingFileHandler.
+
+    This handler is configured for daily rotation but that uses the suffix and
+    extMatch of Hourly rotation, in order to allow seconds based rotation on
+    each startup. The log file is also rotated when the specified size is
+    reached.
+
     """
 
     def __init__(self, *args, **kwargs):
-        """ create the instance and override the suffix and extMatch.
+        """Create the instance and override the suffix and extMatch.
+
         Also accepts a maxBytes keyword arg to rotate the file when it reachs
         maxBytes.
         """
         kwargs['when'] = 'D'
-        kwargs['backupCount'] = LOGBACKUP
-        # check if we are in 2.5, only for PQM
-        if sys.version_info[:2] >= (2, 6):
-            kwargs['delay'] = 1
         if 'maxBytes' in kwargs:
             self.maxBytes = kwargs.pop('maxBytes')
         else:
@@ -119,41 +119,8 @@
             return 0
 
 
-class MultiFilter(logging.Filter):
-    """Our own logging.Filter.
-
-    To allow filter by multiple names in a single handler or logger.
-
-    """
-
-    def __init__(self, names=None):
-        logging.Filter.__init__(self)
-        self.names = names or []
-        self.filters = []
-        for name in self.names:
-            self.filters.append(logging.Filter(name))
-
-    def filter(self, record):
-        """Determine if the specified record is to be logged.
-
-        This work a bit different from the standard logging.Filter, the
-        record is logged if at least one filter allows it.
-        If there are no filters, the record is allowed.
-
-        """
-        if not self.filters:
-            # no filters, allow the record
-            return True
-        for f in self.filters:
-            if f.filter(record):
-                return True
-        return False
-
-
 class DebugCapture(logging.Handler):
-    """
-    A context manager to capture debug logs.
-    """
+    """A context manager to capture debug logs."""
 
     def __init__(self, logger, raise_unhandled=False, on_error=True):
         """Creates the instance.
@@ -250,7 +217,7 @@
             self.emit_debug()
         self.uninstall()
         if self.raise_unhandled and exc_type is not None:
-            raise exc_type, exc_value, traceback
+            raise (exc_type, exc_value, traceback)
         else:
             return True
 
@@ -292,21 +259,157 @@
     return middle
 
 
-# configure the thing #
-LOGBACKUP = 5  # the number of log files to keep around
-
-basic_formatter = logging.Formatter(
-    fmt="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-debug_formatter = logging.Formatter(
-    fmt="%(asctime)s %(name)s %(module)s %(lineno)s %(funcName)s %(message)s")
-
-# a constant to change the default DEBUG level value
-_DEBUG_LOG_LEVEL = logging.DEBUG
-
-
-# partial config of the handler to rotate when the file size is 1MB
-CustomRotatingFileHandler = functools.partial(DayRotatingFileHandler,
-                                              maxBytes=1048576)
-
 # use our logger as the default Logger class
 logging.setLoggerClass(Logger)
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'simple': {
+            'format': '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+        },
+        'debug': {
+            'format': ('%(asctime)s %(name)s %(module)s %(lineno)s '
+                       '%(funcName)s %(message)s'),
+        },
+    },
+    'filters': {
+        'sd_filter': {'name': 'ubuntuone.SyncDaemon'},
+        'twisted_filter': {'name': 'twisted'},
+        'pyinotify_filter': {'name': 'pyinotify'},
+    },
+    'handlers': {
+        'console': {
+            'class': 'logging.StreamHandler',
+        },
+        'debug': {
+            'level': 'DEBUG',
+            'class': 'ubuntuone.logger.DayRotatingFileHandler',
+            'filename': 'syncdaemon-debug.log',
+            'formatter': 'debug',
+        },
+        'broken_nodes': {
+            'level': 'INFO',
+            'class': 'ubuntuone.logger.DayRotatingFileHandler',
+            'filename': 'broken-nodes.log',
+            'formatter': 'simple',
+        },
+        'exceptions': {
+            'level': 'ERROR',
+            'class': 'ubuntuone.logger.DayRotatingFileHandler',
+            'filename': 'exceptions.log',
+            'formatter': 'simple',
+        },
+        'invalid_names': {
+            'level': 'INFO',
+            'class': 'ubuntuone.logger.DayRotatingFileHandler',
+            'filename': 'invalid-names.log',
+            'formatter': 'simple',
+        },
+        'proxy': {
+            'level': 'DEBUG',
+            'class': 'ubuntuone.logger.DayRotatingFileHandler',
+            'filename': 'proxy.log',
+            'formatter': 'simple',
+        },
+        'syncdaemon': {
+            'level': 'DEBUG',
+            'class': 'ubuntuone.logger.DayRotatingFileHandler',
+            'filename': 'syncdaemon.log',
+            'formatter': 'simple',
+            'filters': ['sd_filter', 'twisted_filter', 'pyinotify_filter'],
+        },
+    },
+    'loggers': {
+        '': {
+            'handlers': ['exceptions'],
+            'level': 'ERROR',
+            'propagate': False,
+        },
+        'pyinotify': {
+            'handlers': ['syncdaemon'],
+            'level': 'TRACE',
+            'propagate': False,
+        },
+        'twisted': {
+            'handlers': ['syncdaemon', 'exceptions'],
+            'level': 'ERROR',
+            'propagate': False,
+        },
+        'ubuntuone.proxy': {
+            'handlers': ['proxy'],
+            'level': 'DEBUG',
+            'propagate': False,
+        },
+        'ubuntuone.SyncDaemon': {
+            'handlers': ['syncdaemon'],
+            'level': 'INFO',
+            'propagate': False,
+        },
+        'ubuntuone.SyncDaemon': {
+            'handlers': ['exceptions'],
+            'level': 'ERROR',
+            'propagate': False,
+        },
+        'ubuntuone.SyncDaemon.BrokenNodes': {
+            'handlers': ['broken_nodes'],
+            'level': 'INFO',
+            'propagate': False,
+        },
+        'ubuntuone.SyncDaemon.InvalidNames': {
+            'handlers': ['invalid_names'],
+            'level': 'INFO',
+            'propagate': False,
+        },
+    },
+}
+
+def setup_handler(handler, level):
+    if level < logging.INFO:
+        # don't cap the file size on DEBUG or less
+        handler.maxBytes = 0
+    handler.maxBytes = max_bytes
+    handler.backupCount = backup_count
+
+
+def init(logs_dir, level, dest='', max_bytes=1048576, backup_count=5):
+    valid = ['file', 'stdout', 'stderr']
+    if any(v not in valid for v in dest.split()):
+        # invalid dest value, let the loggers alone
+        raise ValueError('Invalid logger dest %r (must be one of %s).' %
+                         (dest, valid))
+
+    logging_config = LOGGING.copy()
+
+    for h in logging_config['handlers']:
+        if 'filename' in h:
+            h['filename'] = os.path.join(logs_dir, h['filename'])
+
+    for l in logging_config['loggers']:
+        handlers = logging_config['loggers'][l]['handlers']
+        if 'file' in dest:
+            handlers.append('debug')
+        if 'stdout' in dest or 'stderr' in dest:
+            handlers.append('console')
+
+    # hook twisted.python.log with standard logging
+    from twisted.python import log
+    observer = log.PythonLoggingObserver('twisted')
+    observer.start()
+
+    from logging.config import dictConfig
+    dictConfig(logging_config)
+
+    for logger_name in logging_config['loggers']:
+        rotate_logs(logger_name)
+
+
+def rotate_logs(logger_name):
+    """Do a rollover of all the handlers."""
+    for handler in logging.getLogger(logger_name).handlers:
+        # ignore the missing file error on a failed rollover
+        try:
+            handler.doRollover()
+        except OSError:
+            pass

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2016-06-01 18:28:19 +0000
+++ ubuntuone/platform/__init__.py	2018-04-14 23:11:29 +0000
@@ -31,10 +31,7 @@
 import os
 import sys
 
-from dirspec.utils import user_home
-
 from ubuntuone.platform import ipc
-from ubuntuone.platform import logger
 from ubuntuone.platform import os_helper
 
 
@@ -59,7 +56,7 @@
     if (not path.startswith(tilde) or
             (len(path) > 1 and path[1:2] != os.path.sep)):
         return path
-    result = path.replace('~', user_home, 1)
+    result = os.path.expanduser(path)
 
     assert isinstance(result, str)
     try:
@@ -100,10 +97,6 @@
 stat_path = os_helper.stat_path
 walk = os_helper.walk
 
-# From Logger
-setup_filesystem_logging = logger.setup_filesystem_logging
-get_filesystem_logger = logger.get_filesystem_logger
-
 # IPC
 ExternalInterface = ipc.ExternalInterface
 is_already_running = ipc.is_already_running

=== modified file 'ubuntuone/platform/filesystem_notifications/monitor/common.py'
--- ubuntuone/platform/filesystem_notifications/monitor/common.py	2016-05-31 21:43:25 +0000
+++ ubuntuone/platform/filesystem_notifications/monitor/common.py	2018-04-14 23:11:29 +0000
@@ -34,6 +34,7 @@
 
 from twisted.internet import defer
 
+from ubuntuone import logger
 from ubuntuone.platform.filesystem_notifications import notify_processor
 from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
     Event,
@@ -44,9 +45,6 @@
     IN_MOVED_FROM,
     IN_MOVED_TO,
 )
-
-from ubuntuone import logger
-
 from ubuntuone.platform.os_helper import (
     is_valid_syncdaemon_path,
     is_valid_os_path,

=== removed directory 'ubuntuone/platform/logger'
=== removed file 'ubuntuone/platform/logger/__init__.py'
--- ubuntuone/platform/logger/__init__.py	2012-06-21 18:58:50 +0000
+++ ubuntuone/platform/logger/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 *-*
-#
-# Copyright 2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Logger module."""
-
-import os
-import sys
-
-from dirspec.basedir import xdg_cache_home
-
-if sys.platform == "win32":
-    from ubuntuone.platform.logger import windows
-    source = windows
-elif sys.platform == "darwin":
-    from ubuntuone.platform.logger import darwin
-    source = darwin
-else:
-    from ubuntuone.platform.logger import linux
-    source = linux
-
-
-get_filesystem_logger = source.get_filesystem_logger
-setup_filesystem_logging = source.setup_filesystem_logging
-
-ubuntuone_log_dir = os.path.join(xdg_cache_home, 'ubuntuone', 'log')
-ubuntuone_log_dir = ubuntuone_log_dir.decode('utf-8')
-if not os.path.exists(ubuntuone_log_dir):
-    os.makedirs(ubuntuone_log_dir)

=== removed file 'ubuntuone/platform/logger/darwin.py'
--- ubuntuone/platform/logger/darwin.py	2012-05-15 17:10:02 +0000
+++ ubuntuone/platform/logger/darwin.py	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 *-*
-#
-# Copyright 2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-
-
-def get_filesystem_logger():
-    """Return the logger used in the filesystem."""
-
-
-def setup_filesystem_logging(logging_class, root_handler):
-    """Set the syncdameon extra loggin for MAC OS."""
-    # there is nothing yet to be done here.

=== removed file 'ubuntuone/platform/logger/linux.py'
--- ubuntuone/platform/logger/linux.py	2012-05-14 21:24:24 +0000
+++ ubuntuone/platform/logger/linux.py	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-# Author: Manuel de la Pena <[e-mail]>
-#
-# Copyright 2011-2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Provide platform logging settings."""
-
-import logging
-
-import pyinotify
-
-
-def get_filesystem_logger():
-    """Return the logger used by the filesystem."""
-    return getattr(pyinotify, 'log', logging.getLogger('pyinotify'))
-
-
-def setup_filesystem_logging(filesystem_logger, root_handler):
-    """Set the extra logging to be used on linux."""
-    # hook pyinotify logger, but remove the console handler first
-    for hdlr in filesystem_logger.handlers:
-        if isinstance(hdlr, logging.StreamHandler):
-            filesystem_logger.removeHandler(hdlr)
-    filesystem_logger.addHandler(root_handler)
-    filesystem_logger.setLevel(logging.ERROR)
-    filesystem_logger.propagate = False
-    return filesystem_logger

=== removed file 'ubuntuone/platform/logger/windows.py'
--- ubuntuone/platform/logger/windows.py	2012-05-14 19:04:43 +0000
+++ ubuntuone/platform/logger/windows.py	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-# Author: Manuel de la Pena <[e-mail]>
-#
-# Copyright 2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-
-
-def get_filesystem_logger():
-    """Return the logger used in the filesystem."""
-
-
-def setup_filesystem_logging(logging_class, root_handler):
-    """Set the syncdameon extra loggin for windows."""
-    # there is nothing yet to be done here.

=== modified file 'ubuntuone/platform/tests/filesystem_notifications/__init__.py'
--- ubuntuone/platform/tests/filesystem_notifications/__init__.py	2016-09-17 14:29:53 +0000
+++ ubuntuone/platform/tests/filesystem_notifications/__init__.py	2018-04-14 23:11:29 +0000
@@ -30,10 +30,10 @@
 
 from twisted.internet import defer, reactor
 
-from contrib.testing import testcase
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.syncdaemon import event_queue, filesystem_manager
 from ubuntuone.syncdaemon.tritcask import Tritcask
+from ubuntuone.testing import testcase
 
 
 class BaseFSMonitorTestCase(testcase.BaseTwistedTestCase):

=== modified file 'ubuntuone/platform/tests/filesystem_notifications/common.py'
--- ubuntuone/platform/tests/filesystem_notifications/common.py	2016-06-01 18:28:19 +0000
+++ ubuntuone/platform/tests/filesystem_notifications/common.py	2018-04-14 23:11:29 +0000
@@ -38,7 +38,7 @@
 import itertools
 
 from twisted.internet import defer
-from contrib.testing.testcase import BaseTwistedTestCase
+
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
     EventsCodes,
@@ -56,6 +56,7 @@
 )
 from ubuntuone.platform.filesystem_notifications.monitor import ACTIONS
 from ubuntuone.platform.os_helper import get_os_valid_path
+from ubuntuone.testing.testcase import BaseTwistedTestCase
 
 OP_FLAGS = EventsCodes.FLAG_COLLECTIONS['OP_FLAGS']
 IS_DIR = EventsCodes.FLAG_COLLECTIONS['SPECIAL_FLAGS']['IN_ISDIR']

=== modified file 'ubuntuone/platform/tests/filesystem_notifications/test_darwin.py'
--- ubuntuone/platform/tests/filesystem_notifications/test_darwin.py	2016-06-01 18:28:19 +0000
+++ ubuntuone/platform/tests/filesystem_notifications/test_darwin.py	2018-04-14 23:11:29 +0000
@@ -38,8 +38,6 @@
 
 import fsevents
 
-from contrib.testing.testcase import BaseTwistedTestCase
-
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.platform.filesystem_notifications.monitor import (
     common,
@@ -63,6 +61,7 @@
     BaseFSMonitorTestCase,
     common as common_tests,
 )
+from ubuntuone.testing.testcase import BaseTwistedTestCase
 
 
 # A reverse mapping for the tests

=== modified file 'ubuntuone/platform/tests/filesystem_notifications/test_filesystem_notifications.py'
--- ubuntuone/platform/tests/filesystem_notifications/test_filesystem_notifications.py	2016-06-03 19:52:03 +0000
+++ ubuntuone/platform/tests/filesystem_notifications/test_filesystem_notifications.py	2018-04-14 23:11:29 +0000
@@ -35,12 +35,6 @@
 from twisted.trial import unittest
 from ubuntuone.devtools.handlers import MementoHandler
 
-from contrib.testing.testcase import (
-    BaseTwistedTestCase,
-    FakeVolumeManager,
-    skip_if_win32_missing_fs_event,
-    skip_if_darwin_missing_fs_event,
-)
 from ubuntuone.platform import (
     remove_file,
     remove_dir,
@@ -53,6 +47,12 @@
     filesystem_manager,
     filesystem_notifications,
 )
+from ubuntuone.testing.testcase import (
+    BaseTwistedTestCase,
+    FakeVolumeManager,
+    skip_if_win32_missing_fs_event,
+    skip_if_darwin_missing_fs_event,
+)
 
 
 class IgnoreFileTests(unittest.TestCase):

=== modified file 'ubuntuone/platform/tests/filesystem_notifications/test_fsevents_daemon.py'
--- ubuntuone/platform/tests/filesystem_notifications/test_fsevents_daemon.py	2016-06-01 18:28:19 +0000
+++ ubuntuone/platform/tests/filesystem_notifications/test_fsevents_daemon.py	2018-04-14 23:11:29 +0000
@@ -32,7 +32,6 @@
 
 from twisted.internet import defer, protocol
 
-from contrib.testing.testcase import BaseTwistedTestCase
 from ubuntuone import fseventsd
 try:
     from ubuntuone.devtools.testcases import skipIf
@@ -50,6 +49,7 @@
     IN_MOVED_FROM,
     IN_MOVED_TO,
 )
+from ubuntuone.testing.testcase import BaseTwistedTestCase
 
 
 class FakeServerProtocol(protocol.Protocol):

=== modified file 'ubuntuone/platform/tests/filesystem_notifications/test_linux.py'
--- ubuntuone/platform/tests/filesystem_notifications/test_linux.py	2016-06-01 18:28:19 +0000
+++ ubuntuone/platform/tests/filesystem_notifications/test_linux.py	2018-04-14 23:11:29 +0000
@@ -35,7 +35,6 @@
 from twisted.internet import defer, reactor
 from twisted.trial.unittest import TestCase as PlainTestCase
 
-from contrib.testing import testcase
 from ubuntuone.syncdaemon import volume_manager
 from ubuntuone.platform.filesystem_notifications import notify_processor
 from ubuntuone.platform.filesystem_notifications.monitor import (
@@ -44,6 +43,7 @@
 from ubuntuone.platform.tests.filesystem_notifications import (
     BaseFSMonitorTestCase,
 )
+from ubuntuone.testing import testcase
 
 
 class FakeVolume(object):

=== modified file 'ubuntuone/platform/tests/filesystem_notifications/test_windows.py'
--- ubuntuone/platform/tests/filesystem_notifications/test_windows.py	2016-06-01 18:28:19 +0000
+++ ubuntuone/platform/tests/filesystem_notifications/test_windows.py	2018-04-14 23:11:29 +0000
@@ -35,8 +35,6 @@
 from twisted.internet import defer
 from win32file import FILE_NOTIFY_INFORMATION
 
-from contrib.testing.testcase import BaseTwistedTestCase
-
 from ubuntuone.platform.filesystem_notifications.monitor import (
     common,
     windows as filesystem_notifications,
@@ -58,6 +56,7 @@
 from ubuntuone.platform.tests.filesystem_notifications import (
     common as common_tests,
 )
+from ubuntuone.testing.testcase import BaseTwistedTestCase
 
 
 class FakeEventsProcessor(object):

=== modified file 'ubuntuone/platform/tests/ipc/test_linux.py'
--- ubuntuone/platform/tests/ipc/test_linux.py	2016-07-30 21:58:48 +0000
+++ ubuntuone/platform/tests/ipc/test_linux.py	2018-04-14 23:11:29 +0000
@@ -38,11 +38,6 @@
 except ImportError:
     from ubuntuone.devtools.testcase import DBusTestCase
 
-from contrib.testing.testcase import (
-    FakeMainTestCase,
-    FakedService,
-    FakedObject,
-)
 from ubuntuone.platform.ipc import linux as dbus_interface
 from ubuntuone.platform.ipc.linux import (
     DBusExposedObject,
@@ -57,6 +52,11 @@
     DBUS_IFACE_LAUNCHER_NAME,
 )
 from ubuntuone.platform.tools.linux import DBusClient
+from ubuntuone.testing.testcase import (
+    FakeMainTestCase,
+    FakedService,
+    FakedObject,
+)
 
 
 class FakeNetworkManager(DBusExposedObject):

=== modified file 'ubuntuone/platform/tests/ipc/test_perspective_broker.py'
--- ubuntuone/platform/tests/ipc/test_perspective_broker.py	2018-03-08 19:39:13 +0000
+++ ubuntuone/platform/tests/ipc/test_perspective_broker.py	2018-04-14 23:11:29 +0000
@@ -41,10 +41,6 @@
 )
 from twisted.trial.unittest import TestCase
 
-from contrib.testing.testcase import (
-    FakedService,
-    FakeMainTestCase,
-)
 try:
     from ubuntuone.devtools.testcases import skipIf, skipIfOS
 except ImportError:
@@ -80,6 +76,10 @@
     from ubuntuone.networkstate.networkstates import ONLINE
 except ImportError:
     from ubuntuone.networkstate import ONLINE
+from ubuntuone.testing.testcase import (
+    FakedService,
+    FakeMainTestCase,
+)
 
 
 class NoTestCase(object):

=== modified file 'ubuntuone/platform/tests/linux/test_vm.py'
--- ubuntuone/platform/tests/linux/test_vm.py	2016-07-30 21:58:48 +0000
+++ ubuntuone/platform/tests/linux/test_vm.py	2018-04-14 23:11:29 +0000
@@ -1,7 +1,3 @@
-# tests.platform.linux - linux platform tests
-#
-# Author: Guillermo Gonzalez <[e-mail]>
-#
 # Copyright 2010-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -35,7 +31,6 @@
 
 from twisted.internet import defer
 
-from contrib.testing.testcase import FakeMain
 from ubuntuone.storageprotocol import request
 from ubuntuone.syncdaemon.tests.test_vm import (
     MetadataTestCase,
@@ -48,6 +43,7 @@
     LegacyShareFileShelf, _Share, Share, Shared, Root, UDF, _UDF,
     MetadataUpgrader, VMFileShelf,
 )
+from ubuntuone.testing.testcase import FakeMain
 
 
 class VolumesTests(BaseVolumeManagerTests):

=== modified file 'ubuntuone/platform/tests/os_helper/test_os_helper.py'
--- ubuntuone/platform/tests/os_helper/test_os_helper.py	2018-03-08 19:39:13 +0000
+++ ubuntuone/platform/tests/os_helper/test_os_helper.py	2018-04-14 23:11:29 +0000
@@ -36,10 +36,6 @@
 
 from twisted.internet import defer
 
-from contrib.testing.testcase import (
-    BaseTwistedTestCase,
-    skip_if_win32_and_uses_readonly,
-)
 from ubuntuone.platform import (
     access,
     allow_writes,
@@ -66,6 +62,10 @@
     stat_path,
     walk,
 )
+from ubuntuone.testing.testcase import (
+    BaseTwistedTestCase,
+    skip_if_win32_and_uses_readonly,
+)
 
 
 class BaseTestCase(BaseTwistedTestCase):

=== modified file 'ubuntuone/platform/tests/os_helper/test_windows.py'
--- ubuntuone/platform/tests/os_helper/test_windows.py	2016-06-01 18:28:19 +0000
+++ ubuntuone/platform/tests/os_helper/test_windows.py	2018-04-14 23:11:29 +0000
@@ -36,8 +36,6 @@
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from contrib.testing.testcase import BaseTwistedTestCase
-
 from ntsecuritycon import (
     FILE_ALL_ACCESS,
     FILE_GENERIC_READ,
@@ -73,6 +71,7 @@
     OSWrapperTests,
     WalkTests,
 )
+from ubuntuone.testing.testcase import BaseTwistedTestCase
 
 
 # ugly trick to stop pylint for complaining about

=== removed file 'ubuntuone/platform/tests/test_logger.py'
--- ubuntuone/platform/tests/test_logger.py	2012-06-21 18:58:50 +0000
+++ ubuntuone/platform/tests/test_logger.py	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2011-2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Platform independent tests for the XDG constants."""
-
-import os
-
-from dirspec.basedir import xdg_cache_home
-from twisted.trial.unittest import TestCase
-
-from ubuntuone.platform.logger import ubuntuone_log_dir
-
-
-class TestBaseDirectory(TestCase):
-    """Tests for the BaseDirectory module."""
-
-    def test_ubuntuone_log_dir(self):
-        """The ubuntuone_log_dir is correct."""
-        expected = os.path.join(xdg_cache_home,
-                                'ubuntuone', 'log')
-        self.assertEqual(expected, ubuntuone_log_dir)
-        self.assertTrue(os.path.exists(expected))

=== modified file 'ubuntuone/platform/tests/test_tools.py'
--- ubuntuone/platform/tests/test_tools.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/platform/tests/test_tools.py	2018-04-14 23:11:29 +0000
@@ -36,8 +36,6 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipTest, skipIfNotOS
 
-from contrib.testing.testcase import FakeCommand
-
 from ubuntuone.syncdaemon import (
     action_queue,
     event_queue,
@@ -49,6 +47,7 @@
 )
 from ubuntuone.platform import tools
 from ubuntuone.platform.tests import IPCTestCase
+from ubuntuone.testing.testcase import FakeCommand
 
 
 SOME_ERROR = 'CRASH BOOM BANG'

=== modified file 'ubuntuone/platform/tests/test_u1sdtool.py'
--- ubuntuone/platform/tests/test_u1sdtool.py	2016-06-01 18:28:19 +0000
+++ ubuntuone/platform/tests/test_u1sdtool.py	2018-04-14 23:11:29 +0000
@@ -35,11 +35,6 @@
 
 from twisted.internet import defer
 
-from contrib.testing.testcase import (
-    FakeCommand,
-    FakeDownload,
-    FakeUpload,
-)
 from ubuntuone.syncdaemon.vm_helper import get_udf_path
 from ubuntuone.syncdaemon.volume_manager import (
     ACCESS_LEVEL_RO,
@@ -61,6 +56,11 @@
     show_waiting_metadata,
 )
 from ubuntuone.platform.tests.test_tools import TestToolsBase
+from ubuntuone.testing.testcase import (
+    FakeCommand,
+    FakeDownload,
+    FakeUpload,
+)
 
 
 class U1SDToolTests(TestToolsBase):

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2018-03-14 21:01:56 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2018-04-14 23:11:29 +0000
@@ -47,7 +47,8 @@
 from twisted.internet import error as twisted_errors
 from twisted.python.failure import Failure, DefaultException
 
-from ubuntuone import clientdefs
+from ubuntuone import clientdefs, config
+from ubuntuone.logger import TRACE
 from ubuntuone.platform import platform, remove_file
 from ubuntuone.storageprotocol import protocol_pb2, content_hash
 from ubuntuone.storageprotocol import errors as protocol_errors
@@ -56,9 +57,9 @@
     ThrottlingStorageClientFactory,
 )
 from ubuntuone.storageprotocol.context import get_ssl_context
+from ubuntuone.syncdaemon import offload_queue
 from ubuntuone.syncdaemon.interfaces import IActionQueue, IMarker
-from ubuntuone.syncdaemon.logger import mklog, TRACE
-from ubuntuone.syncdaemon import config, offload_queue
+
 
 logger = logging.getLogger("ubuntuone.SyncDaemon.ActionQueue")
 
@@ -69,6 +70,96 @@
 TRANSFER_PROGRESS_THRESHOLD = 64 * 1024
 
 
+class mklog(object):
+    """A logger that keeps track of where it's being called from.
+
+    Create a logger that keeps track of the method where it's being
+    called from, in order to make more informative messages.
+
+    """
+    __slots__ = ('logger', 'zipped_desc')
+
+    def __init__(self, _logger, _method, _share, _uid, *args, **kwargs):
+        # args are _-prepended to lower the chances of them
+        # conflicting with kwargs
+
+        all_args = []
+        for arg in args:
+            all_args.append(
+                repr(arg).decode('ascii', 'replace').encode('ascii', 'replace')
+            )
+        for k, v in kwargs.items():
+            v = repr(v).decode('ascii', 'replace').encode('ascii', 'replace')
+            all_args.append("%s=%r" % (k, v))
+        args = ", ".join(all_args)
+
+        desc = "%-28s share:%-40r node:%-40r %s(%s) " % (_method, _share,
+                                                         _uid, _method, args)
+        desc = desc.replace('%', '%%')
+        self.zipped_desc = zlib.compress(desc, 9)
+        self.logger = _logger
+
+    def _log(self, logger_func, *args):
+        """Generalized form of the different logging methods."""
+        desc = zlib.decompress(self.zipped_desc)
+        text = desc + args[0]
+        logger_func(text, *args[1:])
+
+    def debug(self, *args):
+        """Log at level DEBUG"""
+        self._log(self.logger.debug, *args)
+
+    def info(self, *args):
+        """Log at level INFO"""
+        self._log(self.logger.info, *args)
+
+    def warn(self, *args):
+        """Log at level WARN"""
+        self._log(self.logger.warn, *args)
+
+    def error(self, *args):
+        """Log at level ERROR"""
+        self._log(self.logger.error, *args)
+
+    def exception(self, *args):
+        """Log an exception"""
+        self._log(self.logger.exception, *args)
+
+    def note(self, *args):
+        """Log at NOTE level (high-priority info) """
+        self._log(self.logger.high, *args)
+
+    def trace(self, *args):
+        """Log at level TRACE"""
+        self._log(self.logger.trace, *args)
+
+    def callbacks(self, success_message='success', success_arg='',
+                  failure_message='failure'):
+        """
+        Return a callback and an errback that log success or failure
+        messages.
+
+        The callback/errback pair are pass-throughs; they don't
+        interfere in the callback/errback chain of the deferred you
+        add them to.
+        """
+        def callback(arg, success_arg=success_arg):
+            "it worked!"
+            if callable(success_arg):
+                success_arg = success_arg(arg)
+            self.debug(success_message, success_arg)
+            return arg
+
+        def errback(failure):
+            "it failed!"
+            self.error(failure_message, failure.getErrorMessage())
+            self.debug('traceback follows:\n\n' + failure.getTraceback(), '')
+            return failure
+        return callback, errback
+
+
+
+
 class DeferredInterrupted(Exception):
     """To stop the run when pausing."""
 
@@ -966,12 +1057,12 @@
                           ", client (%r) is not self.client (%r)."
                     logger.warning(msg, req_name, client, self.client)
                     return
-        except request_error, failure:
+        except request_error as failure:
             event = event_error
             self.event_queue.push(event_error, error=str(failure))
         except (twisted_errors.ConnectionLost,
                 twisted_errors.ConnectionDone,
-                OpenSSL.SSL.Error), failure:
+                OpenSSL.SSL.Error) as failure:
             # connection ended, just don't do anything: the SYS_CONNECTION_ETC
             # will be sent by normal client/protocol mechanisms, and logging
             # will be done later in this function.

=== modified file 'ubuntuone/syncdaemon/file_shelf.py'
--- ubuntuone/syncdaemon/file_shelf.py	2015-09-19 23:15:50 +0000
+++ ubuntuone/syncdaemon/file_shelf.py	2018-04-14 23:11:29 +0000
@@ -82,7 +82,7 @@
                 remove_file(path)
                 make_dir(path, True)
             # else, the dir is already there
-        except OSError, e:
+        except OSError as e:
             if e.errno == errno.ENOENT:
                 # the file or dir don't exist
                 make_dir(path, True)

=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2016-06-01 21:38:23 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2018-04-14 23:11:29 +0000
@@ -1,7 +1,3 @@
-# ubuntuone.syncdaemon.filesystem_manager - FSM
-#
-# Author: Facundo Batista <[e-mail]>
-#
 # Copyright 2009-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -43,8 +39,9 @@
 import stat
 import uuid
 
+from ubuntuone import config
 from ubuntuone.clientdefs import NAME
-from ubuntuone.syncdaemon import file_shelf, config
+from ubuntuone.syncdaemon import file_shelf
 from ubuntuone.syncdaemon.volume_manager import VolumeDoesNotExist
 from ubuntuone.syncdaemon.interfaces import IMarker
 from ubuntuone.syncdaemon.marker import MDMarker
@@ -162,12 +159,7 @@
 #
 #
 
-
-# fsm logger
-fsm_logger = logging.getLogger('ubuntuone.SyncDaemon.fsm')
-logger = functools.partial(fsm_logger.log, logging.INFO)
-log_warning = functools.partial(fsm_logger.log, logging.WARNING)
-log_debug = functools.partial(fsm_logger.log, logging.DEBUG)
+logger = logging.getLogger(__name__)
 
 is_forbidden = set("info path node_id share_id is_dir".split()).intersection
 
@@ -332,11 +324,6 @@
         self._trash_dir = os.path.join(data_dir, 'trash')
         self._movelimbo_dir = os.path.join(data_dir, 'move_limbo')
         self.partials_dir = partials_dir
-        if not path_exists(self.partials_dir):
-            make_dir(self.partials_dir, recursive=True)
-        else:
-            # ensure that we can write in the partials_dir
-            set_dir_readwrite(self.partials_dir)
         self.fs = TritcaskShelf(FSM_ROW_TYPE, db)
         self.old_fs = file_shelf.CachedFileShelf(
             fsmdir, cache_size=1500, cache_compact_threshold=4)
@@ -368,8 +355,9 @@
         # load some config
         self.user_config = config.get_user_config()
 
-        logger("initialized: idx_path: %s, idx_node_id: %s, shares: %s",
-               len(self._idx_path), len(self._idx_node_id), len(self.shares))
+        logger.info(
+            "initialized: idx_path: %s, idx_node_id: %s, shares: %s",
+            len(self._idx_path), len(self._idx_node_id), len(self.shares))
 
     def register_eq(self, eq):
         """Registers an EventQueue here."""
@@ -399,8 +387,9 @@
                     self._get_share(mdobj["share_id"])
                 except VolumeDoesNotExist:
                     # oops, the share is gone!, invalidate this mdid
-                    log_warning('Share %r disappeared! deleting mdid: %s',
-                                mdobj['share_id'], mdid)
+                    logger.warning(
+                        'Share %r disappeared! deleting mdid: %s',
+                        mdobj['share_id'], mdid)
                     del self.old_fs[mdid]
                     return False
                 else:
@@ -440,7 +429,7 @@
 
     def _load_metadata_None(self, old_version):
         """Loads metadata from when it wasn't even versioned."""
-        logger("loading metadata from old version %r", old_version)
+        logger.info("loading metadata from old version %r", old_version)
 
         for mdid, mdobj in self._safe_old_fs_iteritems():
             # assure path are bytes (new to version 2)
@@ -485,7 +474,7 @@
 
     def _load_metadata_1(self, old_version):
         """Loads metadata from version 1."""
-        logger("loading metadata from old version %r", old_version)
+        logger.info("loading metadata from old version %r", old_version)
 
         for mdid, mdobj in self._safe_old_fs_iteritems():
             # assure path are bytes (new to version 2)
@@ -528,7 +517,7 @@
 
     def _load_metadata_2(self, old_version):
         """Loads metadata from version 2."""
-        logger("loading metadata from old version %r", old_version)
+        logger.info("loading metadata from old version %r", old_version)
 
         for mdid, mdobj in self._safe_old_fs_iteritems():
             # convert the "yet without content" hashes to "" (new to v3)
@@ -563,7 +552,7 @@
 
     def _load_metadata_3(self, old_version):
         """Loads metadata from version 3."""
-        logger("loading metadata from old version %r", old_version)
+        logger.info("loading metadata from old version %r", old_version)
 
         for mdid, mdobj in self._safe_old_fs_iteritems():
             # fix the path
@@ -592,7 +581,7 @@
 
     def _load_metadata_4(self, old_version):
         """Loads metadata from version 4."""
-        logger("loading metadata from old version %r", old_version)
+        logger.info("loading metadata from old version %r", old_version)
 
         for mdid, mdobj in self._safe_old_fs_iteritems():
             # add the generation number (new to v5)
@@ -618,7 +607,7 @@
 
     def _load_metadata_5(self, old_version):
         """Loads metadata of last version."""
-        logger("loading metadata from old version %r", old_version)
+        logger.info("loading metadata from old version %r", old_version)
 
         for mdid, mdobj in self._safe_old_fs_iteritems():
             abspath = self.get_abspath(mdobj["share_id"], mdobj["path"])
@@ -639,7 +628,7 @@
 
     def _load_metadata_updated(self):
         """Loads metadata of last version."""
-        logger("loading updated metadata")
+        logger.info("loading updated metadata")
         for mdid, mdobj in self.fs.items():
             try:
                 abspath = self.get_abspath(mdobj["share_id"], mdobj["path"])
@@ -649,19 +638,20 @@
                 continue
             if abspath in self._idx_path:
                 # oh, we already have this path in the idx.
-                log_warning("Path already in the index: %s", abspath)
+                logger.warning("Path already in the index: %s", abspath)
                 current_mdobj = self.fs[self._idx_path[abspath]]
                 if current_mdobj['info']['created'] < mdobj['info']['created']:
-                    log_debug("Replacing and deleting node: %s with newer "
-                              "node: %s", current_mdobj['mdid'], mdid)
+                    logger.debug(
+                        "Replacing and deleting node: %s with newer node: %s",
+                        current_mdobj['mdid'], mdid)
                     self._idx_path[abspath] = mdid
                     # and delete the old node
                     del self.fs[current_mdobj['mdid']]
                 else:
                     # do nothing if the current mdobj is newer
-                    log_debug("The node: %s is newer than: %s, "
-                              "leaving it alone and deleting the old one.",
-                              current_mdobj['mdid'], mdid)
+                    logger.debug(
+                        "The node: %s is newer than: %s, leaving it alone and "
+                        "deleting the old one.", current_mdobj['mdid'], mdid)
                     # but delete the old node
                     del self.fs[mdid]
             else:
@@ -691,8 +681,9 @@
         if node_id is not None:
             self._set_node_id(newobj, node_id, path)
 
-        log_debug("create: path=%r mdid=%r share_id=%r node_id=%r is_dir=%r",
-                  path, mdid, share_id, None, is_dir)
+        logger.debug(
+            "create: path=%r mdid=%r share_id=%r node_id=%r is_dir=%r",
+            path, mdid, share_id, None, is_dir)
         self.fs[mdid] = newobj
 
         # adjust the index
@@ -713,8 +704,9 @@
         if mdobj["node_id"] is not None:
             # the object is already there! it's ok if it has the same id
             if mdobj["node_id"] == node_id:
-                log_warning("set_node_id (repeated!): path=%r mdid=%r "
-                            "node_id=%r", path, mdobj['mdid'], node_id)
+                logger.warning(
+                    "set_node_id (repeated!): path=%r mdid=%r node_id=%r",
+                    path, mdobj['mdid'], node_id)
                 return
             msg = "The path %r already has node_id (%r)" % (path, node_id)
             raise ValueError(msg)
@@ -726,8 +718,9 @@
         mdobj["node_id"] = node_id
         mdobj["info"]["node_id_assigned"] = time.time()
 
-        log_debug("set_node_id: path=%r mdid=%r share_id=%r node_id=%r",
-                  path, mdobj['mdid'], share_id, node_id)
+        logger.debug(
+            "set_node_id: path=%r mdid=%r share_id=%r node_id=%r",
+            path, mdobj['mdid'], share_id, node_id)
 
     def get_mdobjs_by_share_id(self, share_id, base_path=None):
         """Get all the mdobjs from a share.
@@ -811,7 +804,7 @@
             raise ValueError("The following attributes can not be set "
                              "externally: %s" % forbidden)
 
-        log_debug("set mdid=%r: %s", mdid, kwargs)
+        logger.debug("set mdid=%r: %s", mdid, kwargs)
         mdobj = self.fs[mdid]
         for k, v in kwargs.items():
             mdobj[k] = v
@@ -857,7 +850,7 @@
             self.eq.rm_from_mute_filter(expected_event,
                                         path_from=path_from, path_to=path_to)
             m = "IOError %s when trying to move file/dir %r"
-            log_warning(m, e, path_from)
+            logger.warning(m, e, path_from)
         self.moved(new_share_id, path_from, path_to)
 
     def moved(self, new_share_id, path_from, path_to):
@@ -865,8 +858,9 @@
         path_from = normpath(path_from)
         path_to = normpath(path_to)
         mdid = self._idx_path.pop(path_from)
-        log_debug("move_file: mdid=%r path_from=%r path_to=%r",
-                  mdid, path_from, path_to)
+        logger.debug(
+            "move_file: mdid=%r path_from=%r path_to=%r",
+            mdid, path_from, path_to)
 
         # if the move overwrites other file, send it to trash
         if path_to in self._idx_path:
@@ -890,7 +884,8 @@
         try:
             mdobj["stat"] = stat_path(path_to)  # needed if not the same FS
         except OSError:
-            log_warning("Got an OSError while getting the stat of %r", path_to)
+            logger.warning(
+                "Got an OSError while getting the stat of %r", path_to)
         self.fs[mdid] = mdobj
 
         if mdobj["is_dir"]:
@@ -916,7 +911,7 @@
         path = normpath(path)
         mdid = self._idx_path[path]
         mdobj = self.fs[mdid]
-        log_debug("delete metadata: path=%r mdid=%r", path, mdid)
+        logger.debug("delete metadata: path=%r mdid=%r", path, mdid)
 
         # adjust all
         del self._idx_path[path]
@@ -933,15 +928,16 @@
         subtree = self.get_paths_starting_with(path, include_base=False)
         for p, is_dir in subtree:
             if self.changed(path=p) == self.CHANGED_LOCAL:
-                logger("Conflicting dir on remove because %r is local", p)
+                logger.info("Conflicting dir on remove because %r is local", p)
                 raise DirectoryNotRemovable()
 
         # check disk searching for previous conflicts
         for (dirpath, dirnames, filenames) in walk(path):
             for fname in filenames + dirnames:
                 if fname.endswith(self.CONFLICT_SUFFIX):
-                    logger("Conflicting dir on remove because of previous "
-                           "conflict on: %r", os.path.join(dirpath, fname))
+                    logger.info(
+                        "Conflicting dir on remove because of previous "
+                        "conflict on: %r", os.path.join(dirpath, fname))
                     raise DirectoryNotRemovable()
 
         return subtree
@@ -952,7 +948,7 @@
         path = normpath(path)
         mdid = self._idx_path[path]
         mdobj = self.fs[mdid]
-        log_debug("delete: path=%r mdid=%r", path, mdid)
+        logger.debug("delete: path=%r mdid=%r", path, mdid)
 
         is_dir = self.is_dir(path=path)
         if is_dir:
@@ -995,8 +991,8 @@
 
         except OSError, e:
             self.eq.rm_from_mute_filter(filter_event, path=path)
-            log_warning("OSError %s when trying to remove file/dir %r",
-                        e, path)
+            logger.exception(
+                "OSError when trying to remove file/dir %r", path)
 
         self.delete_metadata(path)
 
@@ -1004,7 +1000,7 @@
         """Move a file/dir to its .conflict."""
         mdobj = self.fs[mdid]
         path = self.get_abspath(mdobj['share_id'], mdobj['path'])
-        log_debug("move_to_conflict: path=%r mdid=%r", path, mdid)
+        logger.debug("move_to_conflict: path=%r mdid=%r", path, mdid)
         base_to_path = to_path = path + self.CONFLICT_SUFFIX
         ind = 0
         while path_exists(to_path):
@@ -1025,7 +1021,7 @@
                 self.eq.rm_from_mute_filter(expected_event, path=path)
                 if e.errno == errno.ENOENT:
                     m = "Already removed when trying to move to conflict: %r"
-                    log_warning(m, path)
+                    logger.warning(m, path)
                 else:
                     raise
 
@@ -1040,7 +1036,7 @@
                     # it that, :(. We handle this here because it's possible
                     # and correct that the path is not there anymore
                     m = "Error %s when trying to remove the watch on %r"
-                    log_warning(m, e, path)
+                    logger.warning(m, e, path)
 
             self.delete_metadata(p)
         mdobj["info"]["last_conflicted"] = time.time()
@@ -1079,8 +1075,9 @@
     def create_partial(self, node_id, share_id):
         """Create a .partial in disk and set the flag in metadata."""
         mdid = self._idx_node_id[(share_id, node_id)]
-        log_debug("create_partial: mdid=%r share_id=%r node_id=%r",
-                  mdid, share_id, node_id)
+        logger.debug(
+            "create_partial: mdid=%r share_id=%r node_id=%r",
+            mdid, share_id, node_id)
         if self._check_partial(mdid):
             raise ValueError("The object with share_id %r and node_id %r is "
                              "already partial!", share_id, node_id)
@@ -1123,8 +1120,9 @@
     def get_partial_for_writing(self, node_id, share_id):
         """Get a write-only fd to a partial file"""
         mdid = self._idx_node_id[(share_id, node_id)]
-        log_debug("get_partial_for_writing: mdid=%r share_id=%r node_id=%r",
-                  mdid, share_id, node_id)
+        logger.debug(
+            "get_partial_for_writing: mdid=%r share_id=%r node_id=%r",
+            mdid, share_id, node_id)
 
         mdobj = self.fs[mdid]
         partial_path = self._get_partial_path(mdobj)
@@ -1153,8 +1151,9 @@
 
         # move the .partial to the real path, and set the md info
         path = self.get_abspath(mdobj['share_id'], mdobj['path'])
-        log_debug("commit_partial: path=%r mdid=%r share_id=%r node_id=%r",
-                  path, mdid, share_id, node_id)
+        logger.debug(
+            "commit_partial: path=%r mdid=%r share_id=%r node_id=%r",
+            path, mdid, share_id, node_id)
 
         partial_path = self._get_partial_path(mdobj)
         with self._enable_share_write(share_id, path):
@@ -1176,8 +1175,9 @@
         # delete the .partial, and set the md info
         mdobj = self.fs[mdid]
         path = self.get_abspath(mdobj['share_id'], mdobj['path'])
-        log_debug("remove_partial: path=%r mdid=%r share_id=%r node_id=%r",
-                  path, mdid, share_id, node_id)
+        logger.debug(
+            "remove_partial: path=%r mdid=%r share_id=%r node_id=%r",
+            path, mdid, share_id, node_id)
         partial_path = self._get_partial_path(mdobj)
         try:
             # don't alert EQ, partials are in other directory, not watched
@@ -1185,7 +1185,7 @@
         except OSError, e:
             # we only remove it if its there.
             m = "OSError %s when trying to remove partial_path %r"
-            log_warning(m, e, partial_path)
+            logger.warning(m, e, partial_path)
         mdobj["info"]["last_partial_removed"] = time.time()
         mdobj["info"]["is_partial"] = False
         self.fs[mdid] = mdobj
@@ -1390,15 +1390,15 @@
         share_id = mdobj["share_id"]
         path = self.get_abspath(mdobj['share_id'], mdobj['path'])
         is_dir = mdobj["is_dir"]
-        log_debug("delete_to_trash: mdid=%r, parent=%r, share=%r, node=%r, "
-                  "path=%r is_dir=%r", mdid, parent_id, share_id, node_id,
-                  path, is_dir)
+        logger.debug(
+            "delete_to_trash: mdid=%r, parent=%r, share=%r, node=%r, path=%r "
+            "is_dir=%r", mdid, parent_id, share_id, node_id, path, is_dir)
         self.delete_metadata(path)
         self.trash[(share_id, node_id)] = (mdid, parent_id, path, is_dir)
 
     def remove_from_trash(self, share_id, node_id):
         """Delete the node from the trash."""
-        log_debug("remove_from_trash: share=%r, node=%r", share_id, node_id)
+        logger.debug("remove_from_trash: share=%r, node=%r", share_id, node_id)
         if (share_id, node_id) in self.trash:
             del self.trash[(share_id, node_id)]
 
@@ -1431,16 +1431,17 @@
     def add_to_move_limbo(self, share_id, node_id, old_parent_id,
                           new_parent_id, new_name, path_from, path_to):
         """Add the operation info to the move limbo."""
-        log_debug("add to move limbo: share=%r, node=%r, old_parent=%r, "
-                  "new_parent=%r, new_name=%r", share_id, node_id,
-                  old_parent_id, new_parent_id, new_name)
+        logger.debug(
+            "add to move limbo: share=%r, node=%r, old_parent=%r, "
+            "new_parent=%r, new_name=%r", share_id, node_id, old_parent_id,
+            new_parent_id, new_name)
         self.move_limbo[(share_id, node_id)] = (old_parent_id, new_parent_id,
                                                 new_name, path_from, path_to)
 
     def remove_from_move_limbo(self, share_id, node_id):
         """Remove the node from the move limbo."""
-        log_debug("remove from move limbo: share=%r, node=%r",
-                  share_id, node_id)
+        logger.debug(
+            "remove from move limbo: share=%r, node=%r", share_id, node_id)
         if (share_id, node_id) in self.move_limbo:
             del self.move_limbo[(share_id, node_id)]
 
@@ -1488,12 +1489,14 @@
             if node == marker:
                 del self.trash[(share, node)]
                 self.trash[(share, value)] = (mdid, parent, path, is_dir)
-                log_debug("dereference ok trash: share=%r  marker=%r  "
-                          "new node=%r", share, marker, value)
+                logger.debug(
+                    "dereference ok trash: share=%r marker=%r new node=%r",
+                    share, marker, value)
             elif parent == marker:
                 self.trash[(share, node)] = (mdid, value, path, is_dir)
-                log_debug("dereference ok trash: share=%r  node=%r  marker=%r"
-                          "  new parent=%r", share, node, marker, value)
+                logger.debug(
+                    "dereference ok trash: share=%r node=%r marker=%r "
+                    "new parent=%r", share, node, marker, value)
 
         for k, v in self.move_limbo.iteritems():
             share, node = k
@@ -1502,8 +1505,9 @@
             if node == marker:
                 del self.move_limbo[(share, node)]
                 self.move_limbo[(share, value)] = v
-                log_debug("dereference ok move limbo: share=%r  marker=%r  "
-                          "new node=%r", share, marker, value)
+                logger.debug(
+                    "dereference ok move limbo: share=%r marker=%r "
+                    "new node=%r", share, marker, value)
             else:
                 # both parents can be the same marker at the same time
                 if old_parent == marker or new_parent == marker:
@@ -1511,9 +1515,10 @@
                         old_parent = value
                     if new_parent == marker:
                         new_parent = value
-                log_debug("dereference ok move limbo: share=%r  node=%r  "
-                          "marker=%r  old_parent=%r  new_parent=%r",
-                          share, node, marker, old_parent, new_parent)
+                logger.debug(
+                    "dereference ok move limbo: share=%r node=%r marker=%r "
+                    "old_parent=%r  new_parent=%r",
+                    share, node, marker, old_parent, new_parent)
                 self.move_limbo[k] = (old_parent, new_parent, new_name,
                                       path_from, path_to)
 
@@ -1524,15 +1529,17 @@
         """
         for (share, node), (_, parent, _, _) in self.trash.iteritems():
             if node == marker or parent == marker:
-                log_debug("dereference err trash: share=%r  node=%r  "
-                          "marker=%r", share, node, marker)
+                logger.debug(
+                    "dereference err trash: share=%r node=%r marker=%r",
+                    share, node, marker)
                 del self.trash[(share, node)]
 
         move_items = self.move_limbo.iteritems()
         for (share, node), (old_parent, new_parent, _, _, _) in move_items:
             if node == marker or old_parent == marker or new_parent == marker:
-                log_debug("dereference err move limbo: share=%r  node=%r  "
-                          "marker=%r", share, node, marker)
+                logger.debug(
+                    "dereference err move limbo: share=%r node=%r marker=%r",
+                    share, node, marker)
                 del self.move_limbo[(share, node)]
 
 

=== modified file 'ubuntuone/syncdaemon/filesystem_notifications.py'
--- ubuntuone/syncdaemon/filesystem_notifications.py	2018-03-08 19:39:13 +0000
+++ ubuntuone/syncdaemon/filesystem_notifications.py	2018-04-14 23:11:29 +0000
@@ -1,5 +1,3 @@
-# Author: Manuel de la Pena <[e-mail]>
-#
 # Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -34,9 +32,9 @@
 
 from ubuntuone.platform import access, path_exists
 from ubuntuone.syncdaemon.mute_filter import MuteFilter
-from ubuntuone import logger
-# our logging level
-TRACE = logger.TRACE
+
+
+logger = logging.getLogger(__name__)
 
 
 class GeneralINotifyProcessor(object):
@@ -44,9 +42,7 @@
 
     def __init__(self, monitor, handle_dir_delete, name_translations,
                  platform_is_ignored, ignore_mask, ignore_config=None):
-        self.log = logging.getLogger(
-            'ubuntuone.SyncDaemon.filesystem_notifications.GeneralProcessor')
-        self.log.setLevel(TRACE)
+        self.log = logger
         self.invnames_log = logging.getLogger(
             'ubuntuone.SyncDaemon.InvalidNames')
         self.monitor = monitor

=== modified file 'ubuntuone/syncdaemon/fsm/fsm.py'
--- ubuntuone/syncdaemon/fsm/fsm.py	2018-03-08 19:39:13 +0000
+++ ubuntuone/syncdaemon/fsm/fsm.py	2018-04-14 23:11:29 +0000
@@ -1,7 +1,3 @@
-# ubuntuone.syncdaemon.fsm.fsm - a fsm
-#
-# Author: Lucio Torre <[e-mail]>
-#
 # Copyright 2009-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -34,8 +30,10 @@
 """
 
 import itertools
-
-from ubuntuone.syncdaemon import logger
+import logging
+
+
+logger= logging.getLogger(__name__)
 
 
 def hash_dict(d):
@@ -101,7 +99,7 @@
         """Create a state machine based on fsm."""
         self.fsm = fsm
         if log is None:
-            self.log = logger.root_logger
+            self.log = logger
         else:
             self.log = log
 

=== modified file 'ubuntuone/syncdaemon/hash_queue.py'
--- ubuntuone/syncdaemon/hash_queue.py	2016-09-17 14:29:53 +0000
+++ ubuntuone/syncdaemon/hash_queue.py	2018-04-14 23:11:29 +0000
@@ -1,9 +1,3 @@
-# ubuntuone.syncdaemon.hash_queue - hash queues
-#
-# Authors: Facundo Batista <[e-mail]>
-#          Guillermo Gonzalez <[e-mail]>
-#          Alejandro J. Cura <[e-mail]>
-#
 # Copyright 2009-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -102,7 +96,7 @@
 
             try:
                 result = self._hash(path)
-            except (IOError, OSError), e:
+            except (IOError, OSError) as e:
                 m = "Hasher: hash error %s  (path %r  mdid %s)"
                 self.logger.debug(m, e, path, mdid)
                 reactor.callLater(

=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2018-04-14 23:11:29 +0000
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright 2011-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -52,10 +50,10 @@
 except ImportError:
     from ubuntuone.networkstate import ONLINE
 
+from ubuntuone import config
 from ubuntuone.logger import log_call
 from ubuntuone.platform import ExternalInterface
 from ubuntuone.storageprotocol import request
-from ubuntuone.syncdaemon import config
 from ubuntuone.syncdaemon.action_queue import Download, Upload
 from ubuntuone.syncdaemon.interfaces import IMarker
 from ubuntuone.syncdaemon.volume_manager import Share, UDF, VolumeDoesNotExist

=== removed file 'ubuntuone/syncdaemon/logger.py'
--- ubuntuone/syncdaemon/logger.py	2018-03-08 19:39:13 +0000
+++ ubuntuone/syncdaemon/logger.py	1970-01-01 00:00:00 +0000
@@ -1,314 +0,0 @@
-# Copyright 2009-2012 Canonical Ltd.
-# Copyright 2015-2016 Chicharreros (https://launchpad.net/~chicharreros)
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-""" SyncDaemon logging utilities and config. """
-
-from __future__ import with_statement
-
-import logging
-import sys
-import os
-import zlib
-
-from ubuntuone.logger import (
-    _DEBUG_LOG_LEVEL,
-    basic_formatter,
-    CustomRotatingFileHandler,
-    DayRotatingFileHandler,
-    Logger,
-    MultiFilter,
-)
-from ubuntuone.platform.logger import ubuntuone_log_dir
-# api compatibility imports
-from ubuntuone import logger
-from ubuntuone.platform import get_filesystem_logger, setup_filesystem_logging
-DebugCapture = logger.DebugCapture
-NOTE = logger.NOTE
-TRACE = logger.TRACE
-
-
-class mklog(object):
-    """
-    Create a logger that keeps track of the method where it's being
-    called from, in order to make more informative messages.
-    """
-    __slots__ = ('logger', 'zipped_desc')
-
-    def __init__(self, _logger, _method, _share, _uid, *args, **kwargs):
-        # args are _-prepended to lower the chances of them
-        # conflicting with kwargs
-
-        all_args = []
-        for arg in args:
-            all_args.append(
-                repr(arg).decode('ascii', 'replace').encode('ascii', 'replace')
-            )
-        for k, v in kwargs.items():
-            v = repr(v).decode('ascii', 'replace').encode('ascii', 'replace')
-            all_args.append("%s=%r" % (k, v))
-        args = ", ".join(all_args)
-
-        desc = "%-28s share:%-40r node:%-40r %s(%s) " % (_method, _share,
-                                                         _uid, _method, args)
-        desc = desc.replace('%', '%%')
-        self.zipped_desc = zlib.compress(desc, 9)
-        self.logger = _logger
-
-    def _log(self, logger_func, *args):
-        """Generalized form of the different logging methods."""
-        desc = zlib.decompress(self.zipped_desc)
-        text = desc + args[0]
-        logger_func(text, *args[1:])
-
-    def debug(self, *args):
-        """Log at level DEBUG"""
-        self._log(self.logger.debug, *args)
-
-    def info(self, *args):
-        """Log at level INFO"""
-        self._log(self.logger.info, *args)
-
-    def warn(self, *args):
-        """Log at level WARN"""
-        self._log(self.logger.warn, *args)
-
-    def error(self, *args):
-        """Log at level ERROR"""
-        self._log(self.logger.error, *args)
-
-    def exception(self, *args):
-        """Log an exception"""
-        self._log(self.logger.exception, *args)
-
-    def note(self, *args):
-        """Log at NOTE level (high-priority info) """
-        self._log(self.logger.high, *args)
-
-    def trace(self, *args):
-        """Log at level TRACE"""
-        self._log(self.logger.trace, *args)
-
-    def callbacks(self, success_message='success', success_arg='',
-                  failure_message='failure'):
-        """
-        Return a callback and an errback that log success or failure
-        messages.
-
-        The callback/errback pair are pass-throughs; they don't
-        interfere in the callback/errback chain of the deferred you
-        add them to.
-        """
-        def callback(arg, success_arg=success_arg):
-            "it worked!"
-            if callable(success_arg):
-                success_arg = success_arg(arg)
-            self.debug(success_message, success_arg)
-            return arg
-
-        def errback(failure):
-            "it failed!"
-            self.error(failure_message, failure.getErrorMessage())
-            self.debug('traceback follows:\n\n' + failure.getTraceback(), '')
-            return failure
-        return callback, errback
-
-
-LOGFILENAME = os.path.join(ubuntuone_log_dir, 'syncdaemon.log')
-EXLOGFILENAME = os.path.join(ubuntuone_log_dir, 'syncdaemon-exceptions.log')
-INVALIDLOGFILENAME = os.path.join(
-    ubuntuone_log_dir, 'syncdaemon-invalid-names.log')
-BROKENLOGFILENAME = os.path.join(
-    ubuntuone_log_dir, 'syncdaemon-broken-nodes.log')
-
-
-root_logger = logging.getLogger("ubuntuone.SyncDaemon")
-twisted_logger = logging.getLogger('twisted')
-
-filesystem_logger = get_filesystem_logger()
-# now restore our custom logger class
-logging.setLoggerClass(Logger)
-
-root_handler = CustomRotatingFileHandler(filename=LOGFILENAME)
-exception_handler = CustomRotatingFileHandler(filename=EXLOGFILENAME)
-
-
-def init():
-    # root logger
-    root_logger.propagate = False
-    root_logger.setLevel(_DEBUG_LOG_LEVEL)
-    root_handler.addFilter(MultiFilter(['ubuntuone.SyncDaemon',
-                                        'twisted', 'pyinotify']))
-    root_handler.setFormatter(basic_formatter)
-    root_handler.setLevel(_DEBUG_LOG_LEVEL)
-    root_logger.addHandler(root_handler)
-    # exception logs
-    exception_handler.setFormatter(basic_formatter)
-    exception_handler.setLevel(logging.ERROR)
-    # add the exception handler to the root logger
-    logging.getLogger('').addHandler(exception_handler)
-    root_logger.addHandler(exception_handler)
-
-    # hook twisted.python.log with standard logging
-    from twisted.python import log
-    observer = log.PythonLoggingObserver('twisted')
-    observer.start()
-    # configure the logger to only show errors
-    twisted_logger.propagate = False
-    twisted_logger.setLevel(logging.ERROR)
-    twisted_logger.addHandler(root_handler)
-    twisted_logger.addHandler(exception_handler)
-
-    # set the filesystem logging
-    setup_filesystem_logging(filesystem_logger, root_handler)
-
-    # invalid filenames log
-    invnames_logger = logging.getLogger("ubuntuone.SyncDaemon.InvalidNames")
-    invnames_logger.setLevel(_DEBUG_LOG_LEVEL)
-    invnames_handler = CustomRotatingFileHandler(filename=INVALIDLOGFILENAME)
-    invnames_handler.setFormatter(basic_formatter)
-    invnames_handler.setLevel(logging.INFO)
-    invnames_logger.addHandler(invnames_handler)
-
-    # broken nodes log
-    brokennodes_logger = logging.getLogger("ubuntuone.SyncDaemon.BrokenNodes")
-    brokennodes_logger.setLevel(_DEBUG_LOG_LEVEL)
-    brokennodes_handler = CustomRotatingFileHandler(filename=BROKENLOGFILENAME)
-    brokennodes_handler.setFormatter(basic_formatter)
-    brokennodes_handler.setLevel(logging.INFO)
-    brokennodes_logger.addHandler(brokennodes_handler)
-
-
-def configure_logging(level, maxBytes, backupCount):
-    """configure level, maxBytes and backupCount in all handlers"""
-    set_level(level)
-    set_max_bytes(maxBytes)
-    set_backup_count(backupCount)
-
-
-def set_level(level):
-    """set 'level' as the level for all the logger/handlers"""
-    root_logger.setLevel(level)
-    root_handler.setLevel(level)
-
-
-def set_max_bytes(size):
-    """set the maxBytes value in all the handlers"""
-    root_handler.maxBytes = size
-    exception_handler.maxBytes = size
-
-
-def set_backup_count(count):
-    """set the backup count in all the handlers"""
-    root_handler.backupCount = count
-    exception_handler.backupCount = count
-
-
-def set_debug(dest):
-    """ Set the level to debug of all registered loggers, and replace their
-    handlers. if debug_level is file, syncdaemon-debug.log is used. If it's
-    stdout, all the logging is redirected to stdout. If it's stderr, to stderr.
-
-    @param dest: a string with a one or more of 'file', 'stdout', and 'stderr'
-                 e.g. 'file stdout'
-    """
-    if not [v for v in ['file', 'stdout', 'stderr'] if v in dest]:
-        # invalid dest value, let the loggers alone
-        return
-    sd_filter = MultiFilter(['ubuntuone.SyncDaemon', 'twisted', 'pyinotify'])
-    if 'file' in dest:
-        # setup the existing loggers in debug
-        root_handler.setLevel(_DEBUG_LOG_LEVEL)
-        logfile = os.path.join(ubuntuone_log_dir, 'syncdaemon-debug.log')
-        root_handler.baseFilename = os.path.abspath(logfile)
-        # don't cap the file size
-        set_max_bytes(0)
-    for name in ['ubuntuone.SyncDaemon', 'twisted']:
-        logger = logging.getLogger(name)
-        logger.setLevel(_DEBUG_LOG_LEVEL)
-        if 'stderr' in dest:
-            stderr_handler = logging.StreamHandler()
-            stderr_handler.setFormatter(basic_formatter)
-            stderr_handler.setLevel(_DEBUG_LOG_LEVEL)
-            stderr_handler.addFilter(sd_filter)
-            logger.addHandler(stderr_handler)
-        if 'stdout' in dest:
-            stdout_handler = logging.StreamHandler(sys.stdout)
-            stdout_handler.setFormatter(basic_formatter)
-            stdout_handler.setLevel(_DEBUG_LOG_LEVEL)
-            stdout_handler.addFilter(sd_filter)
-            logger.addHandler(stdout_handler)
-
-
-def set_server_debug(dest):
-    """ Set the level to debug of all registered loggers, and replace their
-    handlers. if debug_level is file, syncdaemon-debug.log is used. If it's
-    stdout, all the logging is redirected to stdout.
-
-    @param dest: a string containing 'file' and/or 'stdout', e.g: 'file stdout'
-    """
-    logger = logging.getLogger("storage.server")
-    logger.setLevel(5)  # this shows server messages
-    if 'file' in dest:
-        filename = os.path.join(ubuntuone_log_dir, 'syncdaemon-debug.log')
-        handler = DayRotatingFileHandler(filename=filename)
-        handler.setFormatter(basic_formatter)
-        handler.setLevel(5)  # this shows server messages
-        logger.addHandler(handler)
-    if 'stdout' in dest:
-        stdout_handler = logging.StreamHandler(sys.stdout)
-        stdout_handler.setFormatter(basic_formatter)
-        stdout_handler.setLevel(5)  # this shows server messages
-        logger.addHandler(stdout_handler)
-    if 'stderrt' in dest:
-        stdout_handler = logging.StreamHandler(sys.stdout)
-        stdout_handler.setFormatter(basic_formatter)
-        stdout_handler.setLevel(5)  # this shows server messages
-        logger.addHandler(stdout_handler)
-
-
-# if we are in debug mode, replace/add the handlers
-DEBUG = os.environ.get("MAGICICADA_DEBUG", None)
-if DEBUG:
-    set_debug(DEBUG)
-
-# configure server logging if SERVER_DEBUG != None
-SERVER_DEBUG = os.environ.get("SERVER_DEBUG", None)
-if SERVER_DEBUG:
-    set_server_debug(SERVER_DEBUG)
-
-
-def rotate_logs():
-    """do a rollover of the three handlers"""
-    # ignore the missing file error on a failed rollover
-    try:
-        root_handler.doRollover()
-    except OSError:
-        pass
-    try:
-        exception_handler.doRollover()
-    except OSError:
-        pass

=== modified file 'ubuntuone/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2017-02-10 01:15:07 +0000
+++ ubuntuone/syncdaemon/main.py	2018-04-14 23:11:29 +0000
@@ -33,12 +33,19 @@
 import os
 import sys
 
-from dirspec.utils import user_home
 from twisted.internet import defer, reactor, task
 
+from ubuntuone import config, clientdefs, syncdaemon
+from ubuntuone.platform import (
+    can_write,
+    expand_user,
+    make_dir,
+    path_exists,
+    recursive_move,
+    set_dir_readwrite,
+)
 from ubuntuone.syncdaemon import (
     action_queue,
-    config,
     event_queue,
     filesystem_manager,
     hash_queue,
@@ -48,7 +55,6 @@
     tritcask,
     volume_manager,
 )
-from ubuntuone import syncdaemon, clientdefs
 from ubuntuone.syncdaemon.interaction_interfaces import SyncdaemonService
 from ubuntuone.syncdaemon.states import StateManager, QueueManager
 
@@ -88,7 +94,7 @@
                  shares_symlink_name='Shared With Me',
                  read_limit=None, write_limit=None, throttling_enabled=False,
                  ignore_files=None, auth_credentials=None,
-                 monitor_class=None):
+                 monitor_class=None, cache_dir=None):
         self.root_dir = root_dir
         self.shares_dir = shares_dir
         self.shares_dir_link = os.path.join(self.root_dir, shares_symlink_name)

=== modified file 'ubuntuone/syncdaemon/sync.py'
--- ubuntuone/syncdaemon/sync.py	2018-03-09 09:11:05 +0000
+++ ubuntuone/syncdaemon/sync.py	2018-04-14 23:11:29 +0000
@@ -36,20 +36,17 @@
 from operator import attrgetter
 import sys
 
-from ubuntuone.syncdaemon.marker import MDMarker
+from ubuntuone.logger import DebugCapture
 from ubuntuone.storageprotocol import delta
-from ubuntuone.syncdaemon.fsm.fsm import \
-    StateMachineRunner, StateMachine
 from ubuntuone.syncdaemon import u1fsfsm
-from ubuntuone.syncdaemon.logger import DebugCapture
+from ubuntuone.syncdaemon.fsm.fsm import StateMachineRunner, StateMachine
 from ubuntuone.syncdaemon.filesystem_manager import (
     DirectoryNotRemovable,
     InconsistencyError,
 )
+from ubuntuone.syncdaemon.marker import MDMarker
 from ubuntuone.syncdaemon.volume_manager import VolumeDoesNotExist
-from ubuntuone.platform import (
-    stat_path,
-)
+from ubuntuone.platform import stat_path
 
 empty_hash = ""
 

=== modified file 'ubuntuone/syncdaemon/tests/test_action_queue.py'
--- ubuntuone/syncdaemon/tests/test_action_queue.py	2018-03-14 21:01:56 +0000
+++ ubuntuone/syncdaemon/tests/test_action_queue.py	2018-04-14 23:11:29 +0000
@@ -53,17 +53,9 @@
 from twisted.trial.unittest import TestCase as TwistedTestCase
 from zope.interface.verify import verifyObject, verifyClass
 
-from contrib.testing.testcase import (
-    BaseTwistedTestCase,
-    DummyClass,
-    FakeActionQueue,
-    FakeCommand,
-    FakeMain,
-    FakeUpload,
-)
+from ubuntuone import config, logger, clientdefs
 from ubuntuone.devtools import handlers
 from ubuntuone.devtools.testcases import skipTest
-from ubuntuone import logger, clientdefs
 from ubuntuone.platform import open_file, platform, path_exists
 from ubuntuone.storageprotocol import (
     client,
@@ -72,8 +64,7 @@
     protocol_pb2,
     request,
 )
-from ubuntuone.syncdaemon import interfaces, config
-from ubuntuone.syncdaemon import action_queue
+from ubuntuone.syncdaemon import action_queue, interfaces
 from ubuntuone.syncdaemon.action_queue import (
     ActionQueue, ActionQueueCommand, ChangePublicAccess, CreateUDF,
     DeleteVolume, Download, ListVolumes, ActionQueueProtocol, ListShares,
@@ -87,7 +78,19 @@
 from ubuntuone.syncdaemon.event_queue import EventQueue, EVENTS
 from ubuntuone.syncdaemon import offload_queue
 from ubuntuone.syncdaemon.marker import MDMarker
-from ubuntuone.syncdaemon.volume_manager import ACCESS_LEVEL_RO
+from ubuntuone.syncdaemon.volume_manager import (
+    ACCESS_LEVEL_RO,
+    ACCESS_LEVEL_RW,
+)
+from ubuntuone.testing.testcase import (
+    BaseTwistedTestCase,
+    DummyClass,
+    FakeActionQueue,
+    FakeCommand,
+    FakeMain,
+    FakeUpload,
+)
+
 
 PATH = os.path.join(u'~', u'Documents', u'pdfs', u'moño', u'')
 NAME = u'UDF-me'

=== modified file 'ubuntuone/syncdaemon/tests/test_eq_inotify.py'
--- ubuntuone/syncdaemon/tests/test_eq_inotify.py	2016-09-17 14:29:53 +0000
+++ ubuntuone/syncdaemon/tests/test_eq_inotify.py	2018-04-14 23:11:29 +0000
@@ -40,14 +40,6 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS, skipIfNotOS
 
-from contrib.testing.testcase import (
-    BaseTwistedTestCase,
-    FakeMain,
-    Listener,
-    skip_if_darwin_missing_fs_event,
-    skip_if_win32_missing_fs_event,
-)
-from ubuntuone.syncdaemon.tests.test_eventqueue import BaseEQTestCase
 from ubuntuone.platform import (
     make_link,
     make_dir,
@@ -61,6 +53,14 @@
     set_dir_readwrite,
 )
 from ubuntuone.syncdaemon import event_queue, volume_manager
+from ubuntuone.syncdaemon.tests.test_eventqueue import BaseEQTestCase
+from ubuntuone.testing.testcase import (
+    BaseTwistedTestCase,
+    FakeMain,
+    Listener,
+    skip_if_darwin_missing_fs_event,
+    skip_if_win32_missing_fs_event,
+)
 
 # our logging level
 TRACE = logging.getLevelName('TRACE')

=== modified file 'ubuntuone/syncdaemon/tests/test_eventqueue.py'
--- ubuntuone/syncdaemon/tests/test_eventqueue.py	2018-03-08 19:39:13 +0000
+++ ubuntuone/syncdaemon/tests/test_eventqueue.py	2018-04-14 23:11:29 +0000
@@ -36,11 +36,7 @@
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from contrib.testing.testcase import (
-    BaseTwistedTestCase,
-    FakeMonitor,
-    FakeVolumeManager,
-)
+from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.platform.filesystem_notifications.monitor import (
     FilesystemMonitor,
 )
@@ -49,7 +45,11 @@
     filesystem_manager,
     tritcask,
 )
-from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.testing.testcase import (
+    BaseTwistedTestCase,
+    FakeMonitor,
+    FakeVolumeManager,
+)
 
 
 class BaseEQTestCase(BaseTwistedTestCase):

=== modified file 'ubuntuone/syncdaemon/tests/test_eventsnanny.py'
--- ubuntuone/syncdaemon/tests/test_eventsnanny.py	2016-06-04 21:14:35 +0000
+++ ubuntuone/syncdaemon/tests/test_eventsnanny.py	2018-04-14 23:11:29 +0000
@@ -37,13 +37,13 @@
 
 from twisted.internet import defer, reactor
 
-from contrib.testing.testcase import (
+from ubuntuone.syncdaemon import (filesystem_manager, event_queue,
+                                  events_nanny, hash_queue, tritcask)
+from ubuntuone.testing.testcase import (
     BaseTwistedTestCase,
     FakeVolumeManager,
     skip_if_win32_missing_fs_event,
 )
-from ubuntuone.syncdaemon import (filesystem_manager, event_queue,
-                                  events_nanny, hash_queue, tritcask)
 
 
 class EventListener(object):

=== modified file 'ubuntuone/syncdaemon/tests/test_fileshelf.py'
--- ubuntuone/syncdaemon/tests/test_fileshelf.py	2016-06-04 21:14:35 +0000
+++ ubuntuone/syncdaemon/tests/test_fileshelf.py	2018-04-14 23:11:29 +0000
@@ -1,6 +1,3 @@
-#
-# Author: Guillermo Gonzalez <[e-mail]>
-#
 # Copyright 2009-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -39,7 +36,6 @@
 from twisted.internet import defer
 from ubuntuone.devtools.testcases import skipIfOS
 
-from contrib.testing.testcase import BaseTwistedTestCase
 from ubuntuone.platform import (
     open_file,
     path_exists,
@@ -50,6 +46,7 @@
     LRUCache,
     CacheInconsistencyError,
 )
+from ubuntuone.testing.testcase import BaseTwistedTestCase
 
 
 BROKEN_PICKLE = '\axb80\x02}q\x01(U\x01aU\x04testq\x02U\x01bU\x06brokenq\x03u.'

=== modified file 'ubuntuone/syncdaemon/tests/test_fsm.py'
--- ubuntuone/syncdaemon/tests/test_fsm.py	2016-06-03 19:52:03 +0000
+++ ubuntuone/syncdaemon/tests/test_fsm.py	2018-04-14 23:11:29 +0000
@@ -37,16 +37,7 @@
 from mocker import MockerTestCase, ANY
 from twisted.internet import defer
 
-from contrib.testing.testcase import (
-    BaseTwistedTestCase,
-    FakeVolumeManager,
-    FakeMain,
-    FakeMonitor,
-    Listener,
-    skip_if_win32_and_uses_metadata_older_than_5,
-    skip_if_win32_and_uses_readonly,
-)
-
+from ubuntuone import config
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.platform import (
     listdir,
@@ -70,7 +61,7 @@
     TrashTritcaskShelf,
     TRASH_ROW_TYPE,
 )
-from ubuntuone.syncdaemon import filesystem_manager, config, logger
+from ubuntuone.syncdaemon import filesystem_manager, logger
 from ubuntuone.syncdaemon.file_shelf import FileShelf
 from ubuntuone.syncdaemon.tritcask import Tritcask
 from ubuntuone.syncdaemon.event_queue import EventQueue
@@ -82,6 +73,16 @@
     allow_writes,
     Share,
 )
+from ubuntuone.testing.testcase import (
+    BaseTwistedTestCase,
+    FakeVolumeManager,
+    FakeMain,
+    FakeMonitor,
+    Listener,
+    skip_if_win32_and_uses_metadata_older_than_5,
+    skip_if_win32_and_uses_readonly,
+)
+
 
 BROKEN_PICKLE = '\axb80\x02}q\x01(U\x01aU\x04testq\x02U\x01bU\x06brokenq\x03u.'
 

=== modified file 'ubuntuone/syncdaemon/tests/test_hashqueue.py'
--- ubuntuone/syncdaemon/tests/test_hashqueue.py	2016-09-17 14:29:53 +0000
+++ ubuntuone/syncdaemon/tests/test_hashqueue.py	2018-04-14 23:11:29 +0000
@@ -1,7 +1,3 @@
-#
-# Authors: Facundo Batista <[e-mail]>
-#          Alejandro J. Cura <[e-mail]>
-#
 # Copyright 2009-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -44,11 +40,11 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipTest
 
-from contrib.testing.testcase import BaseTwistedTestCase
 from ubuntuone.platform import open_file, stat_path
 from ubuntuone.syncdaemon import hash_queue
 from ubuntuone.syncdaemon.hash_queue import HASHQUEUE_DELAY
 from ubuntuone.storageprotocol.content_hash import content_hash_factory, crc32
+from ubuntuone.testing.testcase import BaseTwistedTestCase
 
 FAKE_TIMESTAMP = 1
 

=== modified file 'ubuntuone/syncdaemon/tests/test_interaction_interfaces.py'
--- ubuntuone/syncdaemon/tests/test_interaction_interfaces.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/syncdaemon/tests/test_interaction_interfaces.py	2018-04-14 23:11:29 +0000
@@ -41,15 +41,6 @@
     FakeNetworkManagerState,
 )
 
-from contrib.testing.testcase import (
-    FAKED_CREDENTIALS,
-    FakeCommand,
-    FakeDownload,
-    FakeUpload,
-    FakedObject,
-    FakeMainTestCase,
-    skipIfOS,
-)
 from ubuntuone.platform import make_dir, make_link
 from ubuntuone.storageprotocol.protocol_pb2 import AccountInfo
 from ubuntuone.syncdaemon import (
@@ -84,6 +75,15 @@
     UDF,
     VolumeDoesNotExist,
 )
+from ubuntuone.testing.testcase import (
+    FAKED_CREDENTIALS,
+    FakeCommand,
+    FakeDownload,
+    FakeUpload,
+    FakedObject,
+    FakeMainTestCase,
+    skipIfOS,
+)
 
 
 class CustomError(Exception):

=== modified file 'ubuntuone/syncdaemon/tests/test_localrescan.py'
--- ubuntuone/syncdaemon/tests/test_localrescan.py	2018-03-08 19:39:13 +0000
+++ ubuntuone/syncdaemon/tests/test_localrescan.py	2018-04-14 23:11:29 +0000
@@ -38,11 +38,6 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS
 
-from contrib.testing.testcase import (
-    BaseTwistedTestCase,
-    FakeVolumeManager,
-    skip_if_win32_and_uses_readonly,
-)
 from ubuntuone.platform import (
     make_dir,
     make_link,
@@ -69,6 +64,11 @@
     ACCESS_LEVEL_RO,
     ACCESS_LEVEL_RW,
 )
+from ubuntuone.testing.testcase import (
+    BaseTwistedTestCase,
+    FakeVolumeManager,
+    skip_if_win32_and_uses_readonly,
+)
 
 # our logging level
 TRACE = logging.getLevelName('TRACE')

=== modified file 'ubuntuone/syncdaemon/tests/test_main.py'
--- ubuntuone/syncdaemon/tests/test_main.py	2017-02-10 01:15:07 +0000
+++ ubuntuone/syncdaemon/tests/test_main.py	2018-04-14 23:11:29 +0000
@@ -36,9 +36,6 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.platform import expand_user
 
-from contrib.testing.testcase import (
-    BaseTwistedTestCase, FAKED_CREDENTIALS, FakeMonitor
-)
 from ubuntuone.clientdefs import VERSION
 from ubuntuone.logger import NOTE
 from ubuntuone.platform import (
@@ -49,6 +46,9 @@
     remove_dir,
 )
 from ubuntuone.syncdaemon import main as main_mod
+from ubuntuone.testing.testcase import (
+    BaseTwistedTestCase, FAKED_CREDENTIALS, FakeMonitor
+)
 
 
 class FakeListener(object):

=== modified file 'ubuntuone/syncdaemon/tests/test_states.py'
--- ubuntuone/syncdaemon/tests/test_states.py	2018-03-08 18:32:01 +0000
+++ ubuntuone/syncdaemon/tests/test_states.py	2018-04-14 23:11:29 +0000
@@ -33,14 +33,13 @@
 from twisted.internet import defer, reactor
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
-from contrib.testing.testcase import FakeLogger
-from ubuntuone.syncdaemon import states
 from ubuntuone.syncdaemon.states import (
     ConnectionManager,
     Node,
     QueueManager,
     StateManager,
 )
+from ubuntuone.testing.testcase import FakeLogger
 
 
 class FakeEventQueue(object):

=== modified file 'ubuntuone/syncdaemon/tests/test_sync.py'
--- ubuntuone/syncdaemon/tests/test_sync.py	2018-03-09 09:11:05 +0000
+++ ubuntuone/syncdaemon/tests/test_sync.py	2018-04-14 23:11:29 +0000
@@ -43,13 +43,6 @@
 from twisted.python.failure import Failure
 from ubuntuone.devtools.testcases import skipIfOS
 
-from contrib.testing.testcase import (
-    FakeMain,
-    FakeVolumeManager,
-    BaseTwistedTestCase,
-    Listener,
-)
-
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.platform import (
     make_dir,
@@ -66,6 +59,12 @@
 from ubuntuone.storageprotocol.request import ROOT
 from ubuntuone.storageprotocol import delta
 from ubuntuone.syncdaemon.marker import MDMarker
+from ubuntuone.testing.testcase import (
+    FakeMain,
+    FakeVolumeManager,
+    BaseTwistedTestCase,
+    Listener,
+)
 
 
 class TestSyncClassAPI(unittest.TestCase):

=== modified file 'ubuntuone/syncdaemon/tests/test_tritcask.py'
--- ubuntuone/syncdaemon/tests/test_tritcask.py	2016-07-30 21:58:48 +0000
+++ ubuntuone/syncdaemon/tests/test_tritcask.py	2018-04-14 23:11:29 +0000
@@ -42,7 +42,6 @@
 from operator import attrgetter
 from twisted.internet import defer
 
-from contrib.testing.testcase import BaseTwistedTestCase
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.syncdaemon import tritcask
 from ubuntuone.syncdaemon.tritcask import (
@@ -79,6 +78,7 @@
     timestamp,
     logger,
 )
+from ubuntuone.testing.testcase import BaseTwistedTestCase
 
 
 class BaseTestCase(BaseTwistedTestCase):

=== modified file 'ubuntuone/syncdaemon/tests/test_vm.py'
--- ubuntuone/syncdaemon/tests/test_vm.py	2016-06-04 21:14:35 +0000
+++ ubuntuone/syncdaemon/tests/test_vm.py	2018-04-14 23:11:29 +0000
@@ -51,12 +51,8 @@
     ShareResponse,
 )
 
-from contrib.testing.testcase import (
-    BaseTwistedTestCase,
-    FakeMain,
-)
-from ubuntuone import platform
-from ubuntuone.syncdaemon import config, event_queue, tritcask, volume_manager
+from ubuntuone import config, platform
+from ubuntuone.syncdaemon import event_queue, tritcask, volume_manager
 from ubuntuone.syncdaemon.volume_manager import (
     ACCESS_LEVEL_RO,
     ACCESS_LEVEL_RW,
@@ -86,6 +82,10 @@
     set_dir_readonly,
     set_dir_readwrite,
 )
+from ubuntuone.testing.testcase import (
+    BaseTwistedTestCase,
+    FakeMain,
+)
 
 # grab the metadata version before tests fiddle with it
 CURRENT_METADATA_VERSION = VolumeManager.METADATA_VERSION

=== modified file 'ubuntuone/syncdaemon/tests/test_vm_helper.py'
--- ubuntuone/syncdaemon/tests/test_vm_helper.py	2016-06-03 19:52:03 +0000
+++ ubuntuone/syncdaemon/tests/test_vm_helper.py	2018-04-14 23:11:29 +0000
@@ -35,7 +35,6 @@
 import os
 import uuid
 
-from contrib.testing.testcase import BaseTwistedTestCase
 from ubuntuone.platform import expand_user, os_helper
 from ubuntuone.syncdaemon import vm_helper
 from ubuntuone.syncdaemon.tests.test_vm import BaseVolumeManagerTests
@@ -45,6 +44,7 @@
     get_udf_path,
     get_udf_suggested_path,
 )
+from ubuntuone.testing.testcase import BaseTwistedTestCase
 
 
 class VMHelperTest(BaseVolumeManagerTests):

=== modified file 'ubuntuone/syncdaemon/utils.py'
--- ubuntuone/syncdaemon/utils.py	2018-03-14 21:01:56 +0000
+++ ubuntuone/syncdaemon/utils.py	2018-04-14 23:11:29 +0000
@@ -47,12 +47,14 @@
 DARWIN_APP_NAMES = {SYNCDAEMON_EXECUTABLE: 'UbuntuOne Syncdaemon.app'}
 
 
-def _get_bin_cmd(exe_name, extra_fallbacks=[]):
+def _get_bin_cmd(exe_name, extra_fallbacks=None):
     """Get cmd+args to launch 'exe_name'."""
     syncdaemon_dir = os.path.dirname(__file__)
     ubuntuone_dir = os.path.dirname(syncdaemon_dir)
     tree_dir = os.path.dirname(ubuntuone_dir)
-    fallback_dirs = [os.path.join(tree_dir, 'bin')] + extra_fallbacks
+    fallback_dirs = [os.path.join(tree_dir, 'bin')]
+    if extra_fallbacks is not None:
+        fallback_dirs += extra_fallbacks
     path = get_program_path(exe_name,
                             fallback_dirs=fallback_dirs,
                             app_names=DARWIN_APP_NAMES)

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2016-06-01 21:38:23 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2018-04-14 23:11:29 +0000
@@ -42,17 +42,11 @@
 from itertools import ifilter
 
 from twisted.internet import defer
-from ubuntuone.platform import expand_user
-from ubuntuone.storageprotocol import request
-from ubuntuone.storageprotocol.volumes import (
-    ShareVolume,
-    UDFVolume,
-    RootVolume,
-)
 
+from ubuntuone import config
+from ubuntuone.syncdaemon import file_shelf
 from ubuntuone.syncdaemon.marker import MDMarker
 from ubuntuone.syncdaemon.interfaces import IMarker
-from ubuntuone.syncdaemon import file_shelf, config
 from ubuntuone.syncdaemon.tritcask import TritcaskShelf
 from ubuntuone.syncdaemon.vm_helper import (
     create_shares_link,
@@ -62,6 +56,7 @@
 )
 from ubuntuone.platform import (
     allow_writes,
+    expand_user,
     get_path_list,
     is_link,
     listdir,
@@ -79,6 +74,12 @@
     set_dir_readwrite,
     walk,
 )
+from ubuntuone.storageprotocol import request
+from ubuntuone.storageprotocol.volumes import (
+    ShareVolume,
+    UDFVolume,
+    RootVolume,
+)
 
 # tritcask row types
 SHARE_ROW_TYPE = 3

=== renamed directory 'contrib/testing' => 'ubuntuone/testing'
=== modified file 'ubuntuone/testing/testcase.py'
--- contrib/testing/testcase.py	2018-03-14 21:01:56 +0000
+++ ubuntuone/testing/testcase.py	2018-04-14 23:11:29 +0000
@@ -47,8 +47,8 @@
 from zope.interface import implements
 from zope.interface.verify import verifyObject
 
+from ubuntuone import config, logger, platform
 from ubuntuone.syncdaemon import (
-    config,
     action_queue,
     event_queue,
     filesystem_manager as fs_manager,
@@ -61,8 +61,6 @@
     RECENT_TRANSFERS,
     UPLOADING,
 )
-from ubuntuone.syncdaemon import logger
-from ubuntuone import platform
 from ubuntuone.platform import (
     can_write,
     make_dir,
@@ -72,7 +70,9 @@
     stat_path,
 )
 
-logger.init()
+if not path_exists('tmp/logs'):
+    make_dir('tmp/logs', recursive=True)
+logger.init(logs_dir='tmp/logs', level=logging.DEBUG)
 
 FAKED_CREDENTIALS = {'username': 'test_username',
                      'password': 'test_password'}
@@ -259,8 +259,8 @@
         self.vm = volume_manager.VolumeManager(self)
         self.fs = fs_manager.FileSystemManager(
             self.data_dir, self.partials_dir, self.vm, self.db)
-        self.event_q = event_queue.EventQueue(self.fs,
-                                              monitor_class=self._monitor_class)
+        self.event_q = event_queue.EventQueue(
+            self.fs, monitor_class=self._monitor_class)
         self.fs.register_eq(self.event_q)
         self.action_q = self._fake_AQ_class(self.event_q, self,
                                             *self._fake_AQ_params)
@@ -405,11 +405,14 @@
 
         # Patch the user home
         self.home_dir = self.mktemp('ubuntuonehacker')
-        self.patch(platform, "user_home", self.home_dir)
+        self.patch(
+            os.path, "expanduser", lambda p: p.replace('~', self.home_dir))
 
         # use the config from the branch
-        new_get_config_files = lambda: [os.path.join(os.environ['ROOTDIR'],
-                                                     'data', 'syncdaemon.conf')]
+        def new_get_config_files():
+            return [
+                os.path.join(os.environ['ROOTDIR'], 'data', 'syncdaemon.conf')]
+
         self.patch(config, 'get_config_files', new_get_config_files)
 
         # fake a very basic config file with sane defaults for the tests
@@ -626,7 +629,10 @@
         try:
             result = super(FakedObject, self).__getattribute__(attr_name)
         except AttributeError:
-            result = lambda *a, **kw: None
+
+            def result(*a, **kw):
+                return None
+
             super(FakedObject, self).__setattr__(attr_name, result)
 
         if attr_name == '_called':

=== renamed file 'ubuntuone/syncdaemon/tests/test_config.py' => 'ubuntuone/tests/test_config.py'
--- ubuntuone/syncdaemon/tests/test_config.py	2018-03-14 21:55:27 +0000
+++ ubuntuone/tests/test_config.py	2018-04-14 23:11:29 +0000
@@ -37,15 +37,10 @@
 from ConfigParser import ConfigParser
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
-from dirspec.basedir import (
-    xdg_data_home,
-    xdg_cache_home,
-)
 
-from contrib.testing.testcase import BaseTwistedTestCase
-from ubuntuone import platform
+from ubuntuone import config, platform
 from ubuntuone.platform import open_file, path_exists
-from ubuntuone.syncdaemon import config
+from ubuntuone.testing.testcase import BaseTwistedTestCase
 
 
 class TestConfigBasic(BaseTwistedTestCase):
@@ -441,33 +436,6 @@
         self.assertEqual(conf.get_memory_pool_limit(), 666)
 
 
-class UnicodePathsTestCase(TestCase):
-    """Tests for unicode paths."""
-
-    def test_get_config_files_path_encoding(self):
-        """Check that get_config_files uses paths in the right encoding."""
-        temp = self.mktemp()
-        fake_path = os.path.join(temp, u"Ñandú".encode("utf8"))
-        assert isinstance(fake_path, str)
-        os.makedirs(fake_path)
-        with open(os.path.join(fake_path, config.CONFIG_FILE), "w") as f:
-            f.write("this is a fake config file")
-        self.patch(config, "load_config_paths", lambda _: [fake_path])
-        config_files = config.get_config_files()
-        branch_config = os.path.join(fake_path, config.CONFIG_FILE)
-        self.assertIn(branch_config, config_files)
-
-    def test_load_branch_configuration(self):
-        """Check that the configuration from the branch is loaded."""
-        config_files = [os.path.normpath(p) for p in config.get_config_files()]
-        rootdir = os.environ['ROOTDIR']
-        branch_config = os.path.join(rootdir, "data", config.CONFIG_FILE)
-        branch_logging_config = os.path.join(
-            rootdir, "data", config.CONFIG_LOGS)
-        self.assertIn(branch_config, config_files)
-        self.assertIn(branch_logging_config, config_files)
-
-
 class ConfigglueParsersTests(BaseTwistedTestCase):
     """Tests for our custom configglue parsers."""
 
@@ -563,56 +531,6 @@
         }])
 
 
-class XdgHomeParsersTests(BaseTwistedTestCase):
-    """Tests for our custom xdg parsers."""
-
-    good_value = '~/hola/mundo'
-    name = 'home'
-    xdg_dir = os.path.join('', 'home', 'fake')
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(XdgHomeParsersTests, self).setUp()
-        self.parser = getattr(config, '%s_dir_parser' % self.name)
-
-    def test_good_value(self):
-        """Test the parser using a good value."""
-        homedir = os.path.join('', 'home', 'fake')
-        self.patch(platform, 'user_home', homedir)
-        expected = os.path.join(self.xdg_dir, 'hola', 'mundo')
-        actual = self.parser(self.good_value)
-        self.assertEqual(expected, actual)
-        self.assertIsInstance(actual, str)
-        self.assertNotIsInstance(actual, unicode)
-
-    def test_bad_value(self):
-        """Test the parser using a bad value."""
-        bad_value = '/hola'
-        self.assertEqual(config.path_from_unix(bad_value),
-                         self.parser(bad_value))
-
-    def test_invalid_value(self):
-        """Test the parser using an invalid value."""
-        invalid_value = None
-        self.assertRaises(AttributeError, self.parser, invalid_value)
-
-
-class XdgCacheParsersTests(XdgHomeParsersTests):
-    """Tests for our custom xdg parsers."""
-
-    good_value = 'hola/mundo'
-    name = 'xdg_cache'
-    xdg_dir = xdg_cache_home
-
-
-class XdgDataParsersTests(XdgCacheParsersTests):
-    """Tests for our custom xdg parsers."""
-
-    good_value = 'hola/mundo'
-    name = 'xdg_data'
-    xdg_dir = xdg_data_home
-
-
 class SyncDaemonConfigParserTests(BaseTwistedTestCase):
     """Tests for SyncDaemonConfigParser."""
 

=== renamed file 'ubuntuone/syncdaemon/tests/test_logger.py' => 'ubuntuone/tests/test_logger.py'
--- ubuntuone/syncdaemon/tests/test_logger.py	2016-06-04 21:14:35 +0000
+++ ubuntuone/tests/test_logger.py	2018-04-14 23:11:29 +0000
@@ -40,7 +40,7 @@
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testcases import skipIfOS
 
-from ubuntuone.syncdaemon.logger import (
+from ubuntuone.logger import (
     DebugCapture,
     NOTE,
     TRACE,

=== modified file 'ubuntuone/utils/__init__.py'
--- ubuntuone/utils/__init__.py	2016-06-04 21:14:35 +0000
+++ ubuntuone/utils/__init__.py	2018-04-14 23:11:29 +0000
@@ -37,9 +37,6 @@
 import sys
 
 from dirspec.basedir import load_config_paths
-from dirspec.utils import get_program_path
-
-from twisted.python import procutils
 
 
 logger = logging.getLogger(__name__)
@@ -82,54 +79,6 @@
         logger.error(msg, __file__)
 
 
-def get_project_dir():
-    """Return the absolute path to this project's data/ dir.
-
-    Support symlinks, and priorize local (relative) data/ dir. If not
-    found, return the value of the PROJECT_DIR.
-
-    """
-    result = _get_dir(dir_name=DATA_SUFFIX, dir_constant='PROJECT_DIR')
-    assert result is not None, '%r dir can not be None.' % DATA_SUFFIX
-    return result
-
-
-def get_data_file(*args):
-    """Return the absolute path to 'args' within project data dir."""
-    return os.path.join(get_project_dir(), *args)
-
-
-def get_bin_dir():
-    """Return the absolute path to this project's bin/ dir.
-
-    Support symlinks, and priorize local (relative) bin/ dir. If not
-    found, return the value of the BIN_DIR.
-
-    """
-    result = _get_dir(dir_name=BIN_SUFFIX, dir_constant='BIN_DIR')
-    assert result is not None, '%r dir can not be None.' % BIN_SUFFIX
-    logger.info('get_bin_dir: returning dir located at %r.', result)
-    return result
-
-
-def get_bin_cmd(program_name):
-    """Return a list of arguments to launch the given executable."""
-    path = get_program_path(program_name,
-                            fallback_dirs=[get_bin_dir()])
-    cmd_args = [path]
-
-    # adjust cmd for platforms using buildout-generated python
-    # wrappers
-    if getattr(sys, 'frozen', None) is None:
-        if sys.platform in ('darwin'):
-            cmd_args.insert(0, 'python')
-        elif sys.platform in ('win32'):
-            cmd_args.insert(0, procutils.which("python.exe")[0])
-
-    logger.debug('get_bin_cmd: returning %r', cmd_args)
-    return cmd_args
-
-
 def get_cert_dir():
     """Return directory containing certificate files."""
 

=== modified file 'ubuntuone/utils/tests/test_common.py'
--- ubuntuone/utils/tests/test_common.py	2017-01-07 18:51:07 +0000
+++ ubuntuone/utils/tests/test_common.py	2018-04-14 23:11:29 +0000
@@ -32,13 +32,11 @@
 
 from __future__ import unicode_literals
 
-import logging
 import sys
 import os
 
 from twisted.internet import defer
 from twisted.web import resource
-from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.devtools.testing.txwebserver import HTTPWebServer
 
 from ubuntuone import utils
@@ -48,112 +46,6 @@
 NOT_DEFINED = object()
 
 
-class FakedConstantsModule(object):
-    """Fake the 'ubuntuone.controlpanel.constants' module."""
-
-    PROJECT_DIR = '/tmp/foo/bar'
-    BIN_DIR = '/tmp/foo/bin'
-
-
-class GetProjectDirTestCase(TestCase):
-    """Test case for get_project_dir when constants module is not defined."""
-
-    DIR_NAME = utils.DATA_SUFFIX
-    DIR_CONSTANT = 'PROJECT_DIR'
-    DIR_GETTER = 'get_project_dir'
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(GetProjectDirTestCase, self).setUp()
-        self._constants = sys.modules.get(CONSTANTS_MODULE, NOT_DEFINED)
-        sys.modules[CONSTANTS_MODULE] = None  # force ImportError
-
-        self.memento = MementoHandler()
-        self.memento.setLevel(logging.DEBUG)
-        utils.logger.addHandler(self.memento)
-        self.addCleanup(utils.logger.removeHandler, self.memento)
-
-        self.get_dir = getattr(utils, self.DIR_GETTER)
-
-    @defer.inlineCallbacks
-    def tearDown(self):
-        if self._constants is not NOT_DEFINED:
-            sys.modules[CONSTANTS_MODULE] = self._constants
-        else:
-            sys.modules.pop(CONSTANTS_MODULE)
-        yield super(GetProjectDirTestCase, self).tearDown()
-
-    def test_get_dir_relative(self):
-        """The relative path for the data directory is correctly retrieved."""
-        module = utils.os.path.dirname(utils.__file__)
-        rel_data = utils.os.path.join(module,
-                                      utils.os.path.pardir,
-                                      utils.os.path.pardir,
-                                      self.DIR_NAME)
-        expected_dir = utils.os.path.abspath(rel_data)
-
-        # ensure expected_path exists at os level
-        self.patch(utils.os.path, 'exists', lambda path: path == expected_dir)
-
-        result = self.get_dir()
-        self.assertEqual(expected_dir, result)
-
-    def test_get_dir_none_exists(self):
-        """No data directory exists, return None and log as error."""
-        self.patch(utils.os.path, 'exists', lambda path: False)
-        sys.modules[CONSTANTS_MODULE] = None
-
-        self.assertRaises(AssertionError, self.get_dir)
-        msg = 'get_dir: can not build a valid path.'
-        self.assertTrue(self.memento.check_error(msg))
-
-
-class GetProjectDirWithConstantsTestCase(GetProjectDirTestCase):
-    """Test case for get_dir when constants module is defined."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(GetProjectDirWithConstantsTestCase, self).setUp()
-        self.patch(utils.os.path, 'exists', lambda path: False)
-        self._constants = sys.modules.get(CONSTANTS_MODULE, NOT_DEFINED)
-        sys.modules[CONSTANTS_MODULE] = FakedConstantsModule()
-
-    def test_get_dir(self):
-        """If the constants.py module exists, use PROJECT_DIR from it."""
-        result = self.get_dir()
-        expected = getattr(sys.modules[CONSTANTS_MODULE], self.DIR_CONSTANT)
-        self.assertEqual(expected, result)
-
-
-class GetBinDirTestCase(GetProjectDirTestCase):
-    """Test case for get_bin_dir when constants module is not defined."""
-
-    DIR_NAME = utils.BIN_SUFFIX
-    DIR_CONSTANT = 'BIN_DIR'
-    DIR_GETTER = 'get_bin_dir'
-
-
-class GetBinDirWithConstantsTestCase(GetProjectDirWithConstantsTestCase):
-    """Test case for get_bin_dir when constants module is defined."""
-
-    DIR_NAME = utils.BIN_SUFFIX
-    DIR_CONSTANT = 'BIN_DIR'
-    DIR_GETTER = 'get_bin_dir'
-
-
-class GetDataFileTestCase(TestCase):
-    """Test cases for get_data_file."""
-
-    def test_get_data_file(self):
-        """The path for a data file is correctly retrieved."""
-        dummy_dir = '/yadda/yadda'
-        dummy_file = 'test.png'
-        self.patch(utils, 'get_project_dir', lambda: dummy_dir)
-        result = utils.get_data_file(dummy_file)
-        expected = utils.os.path.join(dummy_dir, dummy_file)
-        self.assertEqual(expected, result)
-
-
 class GetCertDirTestCase(TestCase):
     """Test determining the cert location."""