Merge lp://qastaging/~mikemc/ubuntuone-client/find-logging-conf into lp://qastaging/ubuntuone-client
| Status: | Merged |
|---|---|
| Approved by: | Brian Curtin |
| Approved revision: | 1346 |
| Merged at revision: | 1347 |
| Proposed branch: | lp://qastaging/~mikemc/ubuntuone-client/find-logging-conf |
| Merge into: | lp://qastaging/ubuntuone-client |
| Diff against target: |
46 lines (+11/-7) 2 files modified
tests/syncdaemon/test_config.py (+9/-6) ubuntuone/syncdaemon/config.py (+2/-1) |
| To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-client/find-logging-conf |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brian Curtin (community) | Approve | ||
| Michał Karnicki (community) | Approve | ||
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Use file-relative path for logging.conf to find it in u1-client tree even when CWD is outside. (LP: #1067489)
Description of the change
- Use file-relative path for logging.conf to find it in u1-client tree even when CWD is outside. (LP: #1067489)
This is only a problem when running from source on windows or darwin without having previously installed the app (windows) or run the bundled .app (darwin).
If you've done that, then logging.conf is in the default place and it'll find it there without having to fall back to the incorrect relative path 'data/logging.conf' that it currently generates.
This branch also moves the test that checks this property to a different test case subclass, because the current one patches get_config_files, so we ended up testing the patched lambda with test data.
TO TEST: run the test suite (or just test_config.py)
IRL TEST: make sure you don't have logging.conf in the installed location then try running control panel from source. it'll hang forever waiting for syncdaemon which keeps dying with a message about logging_level.
| Roberto Alsina (ralsina) | # |
| Michał Karnicki (karni) | # |
Tests work for me. Also approved.