Merge lp:~vila/bzr/1514210-config-test-failures into lp:bzr
Proposed by
Vincent Ladeuil
Status: | Merged |
---|---|
Approved by: | Richard Wilbur |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6608 |
Proposed branch: | lp:~vila/bzr/1514210-config-test-failures |
Merge into: | lp:bzr |
Diff against target: |
143 lines (+24/-20) 2 files modified
bzrlib/tests/test_config.py (+18/-17) doc/en/release-notes/bzr-2.7.txt (+6/-3) |
To merge this branch: | bzr merge lp:~vila/bzr/1514210-config-test-failures |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Richard Wilbur | Approve | ||
Review via email: mp+282591@code.launchpad.net |
Commit message
Rename assertWarns in test_config to avoid clashing with unittest2 assertWarns.
Description of the change
Thanks Jelmer for reporting the issue and sorry it took so long to look at it :-/
It appears that recent python have switched to unittest2 which introduces a new assertWarns method.
The test_config tests were defining some helpers in a mixin, one of which was also named assertWarns but with a completely different intent and signature.
Thanks to multiple inheritance python now chose the base class method now and not the mixin one.
I've fixed it by getting rid of the mixin in favour of a base class and renaming assertWarns and assertErrors for good measure.
To post a comment you must log in.
Good fix, Vincent.
+2