Merge lp:~mikemc/ubuntuone-client/refactor-platform-event-logging into lp:ubuntuone-client
Proposed by
Mike McCracken
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 1239 |
Merged at revision: | 1241 |
Proposed branch: | lp:~mikemc/ubuntuone-client/refactor-platform-event-logging |
Merge into: | lp:ubuntuone-client |
Prerequisite: | lp:~mikemc/ubuntuone-client/test-platform-init-typo-bugfix |
Diff against target: |
159 lines (+36/-50) 7 files modified
tests/platform/event_logging/__init__.py (+27/-0) tests/platform/event_logging/test_linux.py (+2/-2) tests/platform/event_logging/test_windows.py (+1/-1) ubuntuone/platform/event_logging/__init__.py (+5/-8) ubuntuone/platform/event_logging/linux.py (+0/-1) ubuntuone/platform/windows/__init__.py (+1/-2) ubuntuone/platform/windows/event_logging.py (+0/-36) |
To merge this branch: | bzr merge lp:~mikemc/ubuntuone-client/refactor-platform-event-logging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Manuel de la Peña (community) | Approve | ||
Mike McCracken (community) | Abstain | ||
Brian Curtin (community) | Approve | ||
dobey (community) | Approve | ||
Review via email: mp+104301@code.launchpad.net |
Commit message
- Refactor ubuntuone platform/
Description of the change
- Refactor ubuntuone platform/
* creates event_logging package in platform/
- Note: it's small to be a package, but this avoids importing 'is_zeitgeist_
* moves platform/
* moves code in platform/
* removes platform/
Tested on linux.
To post a comment you must log in.
Tests aren't passing on Windows:
Traceback (most recent call last): bin\python- script. py", line 62, in <module> __file_ _) bin\u1trial" , line 331, in <module> bin\u1trial" , line 311, in main get_suite( config) bin\u1trial" , line 184, in get_suite 'ignore- paths'] )) bin\u1trial" , line 168, in _collect_tests unittest( filepath) bin\u1trial" , line 108, in _load_unittest working\ mmcc\tests\ platform\ __init_ _.py", line 34, in <module> working\ mmcc\tests\ platform\ ipc\test_ windows. py", line 44, in <module> testing. testcase import ( working\ mmcc\contrib\ testing\ testcase. py", line 49, in <module> syncdaemon import ( working\ mmcc\ubuntuone\ syncdaemon\ config. py", line 47, in <module> working\ mmcc\ubuntuone\ platform\ __init_ _.py", line 40, in <module> working\ mmcc\ubuntuone\ platform\ windows\ __init_ _.py", line 74, in <m platform. windows import event_logging
File "C:\u1\
execfile(
File "C:\u1\
main()
File "C:\u1\
suite = trial_runner.
File "C:\u1\
config[
File "C:\u1\
module_suite = self._load_
File "C:\u1\
module = __import__(modpath, None, None, [""])
File "C:\u1\
from tests.platform.ipc import test_windows
File "C:\u1\
from contrib.
File "C:\u1\
from ubuntuone.
File "C:\u1\
from ubuntuone.platform import expand_user
File "C:\u1\
from ubuntuone.platform import windows
File "C:\u1\
odule>
from ubuntuone.
ImportError: cannot import name event_logging