Merge lp://staging/~sinzui/charmworld/test-log-chaf into lp://staging/~juju-jitsu/charmworld/trunk
Proposed by
Curtis Hovey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Curtis Hovey | ||||
| Approved revision: | 306 | ||||
| Merged at revision: | 306 | ||||
| Proposed branch: | lp://staging/~sinzui/charmworld/test-log-chaf | ||||
| Merge into: | lp://staging/~juju-jitsu/charmworld/trunk | ||||
| Diff against target: |
46 lines (+10/-5) 2 files modified
charmworld/jobs/tests/test_lp.py (+6/-4) migrations/versions/010_remap_options.py (+4/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~sinzui/charmworld/test-log-chaf | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Curtis Hovey (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Ensure logging is correctly handled for the test suite.
Description of the change
The test output was cluttered with out put from two tests.
* The dequeue test didn't monkeypatch the call to configure_logging, causing the log cruft to appear.
* The 010 migration prints the exception that is tested. Switching to a log fixes the issue.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Self-approved trivial fix for testing.