Merge lp://qastaging/~dobey/tarmac/merge-tests into lp://qastaging/tarmac
Proposed by
dobey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Paul Hummer | ||||
| Approved revision: | 364 | ||||
| Merged at revision: | 365 | ||||
| Proposed branch: | lp://qastaging/~dobey/tarmac/merge-tests | ||||
| Merge into: | lp://qastaging/tarmac | ||||
| Diff against target: |
466 lines (+186/-97) 9 files modified
tarmac/bin/commands.py (+1/-1) tarmac/log.py (+8/-2) tarmac/plugins/bugresolver.py (+5/-1) tarmac/tests/__init__.py (+78/-2) tarmac/tests/mock.py (+1/-1) tarmac/tests/test_branch.py (+2/-44) tarmac/tests/test_commands.py (+80/-35) tarmac/tests/test_config.py (+2/-1) tarmac/tests/test_registry.py (+9/-10) |
||||
| To merge this branch: | bzr merge lp://qastaging/~dobey/tarmac/merge-tests | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Paul Hummer | Approve | ||
|
Review via email:
|
|||
Commit message
Some better tests for cmd_merge
Make sure we pass the config around for setting up logging in tests
Set up logging for the 'bzr' logger too, so we get logs of bzr problems
Fix the bug resolver to noop if there are no fixed bugs in the merge
Split out the setUp for branch tests so merge tests can use it as well
Set up an lp: handler for the BranchTestCase
Use lp:$name for branch identities and urls everywhere
Remove the no longer needed FakeLaunchpad object
Set up the merge tests to use BranchTestCase and to test the basic merging
Fix config tests to handle using lp: branch identities
Fix registry tests to pass in config, so that logging goes to test logs
To post a comment you must log in.
Revision history for this message
| Paul Hummer (rockstar) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
