Merge lp:~dobey/u1sync/use-dirspec into lp:u1sync

[dobey]

Get the log dir from the platform logger module

This depends on https://code.launchpad.net/~dobey/ubuntuone-client/use-dirspec/+merge/111479 landing first.

[Brian Curtin (brian.curtin)]

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/u1sync/use-dirspec into lp:u1sync failed. Below is the output from the failed tests.

u1sync
  tests
    test_client ... [ERROR]
u1sync.tests.test_merge
  MergeTest
    test_clobber ... [OK]
    test_generic_merge ... [OK]
    test_sync ... [OK]

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/trial/runner.py", line 572, in loadPackage
    module = modinfo.load()
  File "/usr/lib/python2.7/dist-packages/twisted/python/modules.py", line 383, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/usr/lib/python2.7/dist-packages/twisted/python/reflect.py", line 464, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/mnt/tarmac/cache/u1sync/trunk/u1sync/tests/test_client.py", line 23, in <module>
    from u1sync import client
  File "/mnt/tarmac/cache/u1sync/trunk/u1sync/client.py", line 35, in <module>
    from ubuntuone.platform.logger import ubuntuone_log_dir
exceptions.ImportError: No module named logger

u1sync.tests.test_client
-------------------------------------------------------------------------------
Ran 4 tests in 0.148s

FAILED (errors=1, successes=3)

ERROR:root:Could not find any typelib for Unity

[Manuel de la Peña (mandel)]

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/u1sync/use-dirspec into lp:u1sync failed. Below is the output from the failed tests.

u1sync
  tests
    test_client ... [ERROR]
u1sync.tests.test_merge
  MergeTest
    test_clobber ... [OK]
    test_generic_merge ... [OK]
    test_sync ... [OK]

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/trial/runner.py", line 572, in loadPackage
    module = modinfo.load()
  File "/usr/lib/python2.7/dist-packages/twisted/python/modules.py", line 383, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/usr/lib/python2.7/dist-packages/twisted/python/reflect.py", line 464, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/usr/lib/python2.7/dist-packages/twisted/python/reflect.py", line 400, in _importAndCheckStack
    return __import__(importName)
  File "/mnt/tarmac/cache/u1sync/trunk/u1sync/tests/test_client.py", line 23, in <module>
    from u1sync import client
  File "/mnt/tarmac/cache/u1sync/trunk/u1sync/client.py", line 67, in <module>
    handler = RotatingFileHandler(LOGFILENAME)
  File "/usr/lib/python2.7/logging/handlers.py", line 118, in __init__
    BaseRotatingHandler.__init__(self, filename, mode, encoding, delay)
  File "/usr/lib/python2.7/logging/handlers.py", line 65, in __init__
    logging.FileHandler.__init__(self, filename, mode, encoding, delay)
  File "/usr/lib/python2.7/logging/__init__.py", line 897, in __init__
    StreamHandler.__init__(self, self._open())
  File "/usr/lib/python2.7/logging/__init__.py", line 916, in _open
    stream = open(self.baseFilename, self.mode)
exceptions.IOError: [Errno 2] No such file or directory: '/mnt/tarmac/.cache/u1sync/log/u1sync.log'

u1sync.tests.test_client
-------------------------------------------------------------------------------
Ran 4 tests in 0.065s

FAILED (errors=1, successes=3)

ERROR:root:Could not find any typelib for Unity

[lp:~dobey/u1sync/use-dirspec]

7. By dobey on 2012-06-22

Fix the tests

=== modified file 'u1sync/client.py'
--- u1sync/client.py	2012-06-18 13:52:04 +0000
+++ u1sync/client.py	2012-06-22 15:24:17 +0000
@@ -28,11 +28,11 @@
 from Queue import Queue
 from threading import Lock
 import zlib
+
 from cStringIO import StringIO
-
+from dirspec.basedir import xdg_cache_home
 from twisted.internet import reactor, defer
 from twisted.internet.defer import inlineCallbacks, returnValue
-from ubuntuone.platform.xdg_base_directory import ubuntuone_log_dir
 from ubuntuone.storageprotocol.content_hash import crc32
 from ubuntuone.storageprotocol.context import get_ssl_context
 from u1sync.genericmerge import MergeNode
@@ -62,7 +62,10 @@
     """Converts a share UUID to a form the protocol likes."""
     return str(share_uuid) if share_uuid is not None else request.ROOT
 
-LOGFILENAME = os.path.join(ubuntuone_log_dir, 'u1sync.log')
+u1sync_log_dir = os.path.join(xdg_cache_home, 'u1sync', 'log')
+LOGFILENAME = os.path.join(u1sync_log_dir, 'u1sync.log')
+if not os.path.exists(u1sync_log_dir):
+    os.makedirs(u1sync_log_dir)
 u1_logger = logging.getLogger("u1sync.timing.log")
 handler = RotatingFileHandler(LOGFILENAME)
 u1_logger.addHandler(handler)