Merge lp:~jml/testtools/matches-exception-791889 into lp:~testtools-committers/testtools/trunk
Proposed by
Jonathan Lange
Status: | Merged |
---|---|
Approved by: | Robert Collins |
Approved revision: | 211 |
Merged at revision: | 210 |
Proposed branch: | lp:~jml/testtools/matches-exception-791889 |
Merge into: | lp:~testtools-committers/testtools/trunk |
Diff against target: |
132 lines (+43/-15) 3 files modified
NEWS (+6/-0) testtools/matchers.py (+11/-11) testtools/tests/test_matchers.py (+26/-4) |
To merge this branch: | bzr merge lp:~jml/testtools/matches-exception-791889 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Collins | Approve | ||
Review via email: mp+68595@code.launchpad.net |
Commit message
Update MatchesException to allow taking a Matcher as well as a regular expression.
Description of the change
Allow MatchesException to take a Matcher instead of an regular expression.
Updates AfterPreprocessing to show the original, unprocessed value.
Changes the mismatch description from MatchesRegex.
To post a comment you must log in.
It might be nicer to say 'value was not matched by regex'; blargh, I dunno :)