Merge lp:~jml/testtools/expected-exception-791889 into lp:~testtools-committers/testtools/trunk

Proposed by Jonathan Lange
Status: Merged
Merged at revision: 219
Proposed branch: lp:~jml/testtools/expected-exception-791889
Merge into: lp:~testtools-committers/testtools/trunk
Diff against target: 0 lines
To merge this branch: bzr merge lp:~jml/testtools/expected-exception-791889
Reviewer Review Type Date Requested Status
testtools committers Pending
Review via email: mp+69546@code.launchpad.net

Description of the change

This patch *actually* fixes bug 791889. Really.

In https://code.launchpad.net/~jml/testtools/matches-exception-791889/+merge/68595, I had assumed that the bug was about MatchesException. Luckily, the changes in that branch were also worthwhile, and made this branch much easier.

What we do here is make ExpectedException delegate to MatchesException for its logic. Neat, huh?

Also took the opportunity to tweak AfterPreprocessing so we can use it "silently", such that it doesn't leave a trace of itself in the mismatch. For the cases here, it actually makes the errors clearer.

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Looks nice to me.

Cheers,
mwh

220. By Jonathan Lange

NEWS & docs.

221. By Jonathan Lange

Merge trunk.

Preview Diff

Empty

Subscribers

People subscribed via source and target branches