Merge lp://staging/~dobey/u1sync/use-dirspec into lp://staging/u1sync
Proposed by
dobey
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | dobey | ||||
Approved revision: | 7 | ||||
Merged at revision: | 6 | ||||
Proposed branch: | lp://staging/~dobey/u1sync/use-dirspec | ||||
Merge into: | lp://staging/u1sync | ||||
Diff against target: |
29 lines (+6/-3) 1 file modified
u1sync/client.py (+6/-3) |
||||
To merge this branch: | bzr merge lp://staging/~dobey/u1sync/use-dirspec | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Curtin (community) | Approve | ||
Manuel de la Peña (community) | Approve | ||
Review via email:
|
Commit message
Get the log dir from the platform logger module
Description of the change
This depends on https:/
To post a comment you must log in.
The attempt to merge lp:~dobey/u1sync/use-dirspec into lp:u1sync failed. Below is the output from the failed tests.
u1sync tests.test_ merge generic_ merge ... [OK]
tests
test_client ... [ERROR]
u1sync.
MergeTest
test_clobber ... [OK]
test_
test_sync ... [OK]
======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= == python2. 7/dist- packages/ twisted/ trial/runner. py", line 572, in loadPackage python2. 7/dist- packages/ twisted/ python/ modules. py", line 383, in load pythonPath. moduleLoader( self.name) python2. 7/dist- packages/ twisted/ python/ reflect. py", line 464, in namedAny Stack(trialname ) cache/u1sync/ trunk/u1sync/ tests/test_ client. py", line 23, in <module> cache/u1sync/ trunk/u1sync/ client. py", line 35, in <module> platform. logger import ubuntuone_log_dir ImportError: No module named logger
[ERROR]
Traceback (most recent call last):
File "/usr/lib/
module = modinfo.load()
File "/usr/lib/
return self.pathEntry.
File "/usr/lib/
topLevelPackage = _importAndCheck
File "/mnt/tarmac/
from u1sync import client
File "/mnt/tarmac/
from ubuntuone.
exceptions.
u1sync. tests.test_ client ------- ------- ------- ------- ------- ------- ------- ------- ------- ------- --
-------
Ran 4 tests in 0.148s
FAILED (errors=1, successes=3)
ERROR:root:Could not find any typelib for Unity