Merge lp://staging/~mbp/testscenarios/module-scenarios into lp://staging/~testtools-committers/testscenarios/trunk

Proposed by Martin Pool
Status: Merged
Merged at revision: 19
Proposed branch: lp://staging/~mbp/testscenarios/module-scenarios
Merge into: lp://staging/~testtools-committers/testscenarios/trunk
Diff against target: 140 lines (+87/-2)
4 files modified
NEWS (+6/-0)
README (+29/-0)
lib/testscenarios/scenarios.py (+35/-1)
lib/testscenarios/tests/test_scenarios.py (+17/-1)
To merge this branch: bzr merge lp://staging/~mbp/testscenarios/module-scenarios
Reviewer Review Type Date Requested Status
Robert Collins Pending
Review via email: mp+80287@code.staging.launchpad.net

This proposal supersedes a proposal from 2011-07-08.

Description of the change

This separates out something we do in bzr, which is to multiply tests by both Python and Pyrex/C implementations of the same interface.

To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote : Posted in a previous version of this proposal

For some reason this has generated a merge proposal with a bunch of conflicts :(

Revision history for this message
Martin Pool (mbp) wrote :

conflicts fixed (at least locally)

Revision history for this message
Martin Pool (mbp) wrote :

robert could you review this please?

Revision history for this message
Robert Collins (lifeless) wrote :

I think this is good but IIRC John has a desire to sometimes require that the other implementation is present. Perhaps rather than eliding implements we cannot import, we emit synthetic skips for them, would permit the test runner to decide on policy (e.g. to fail, or to just report the test as skipped).

What do you think?

Other than that this seems very nice.

Revision history for this message
Martin Pool (mbp) wrote :

On 29 November 2011 13:13, Robert Collins <email address hidden> wrote:
> I think this is good but IIRC John has a desire to sometimes require that the other implementation is present. Perhaps rather than eliding implements we cannot import, we emit synthetic skips for them, would permit the test runner to decide on policy (e.g. to fail, or to just report the test as skipped).

I think that's reasonable to want. Also, squashing ImportError
altogether is probably too likely to hide real problems.

Revision history for this message
Martin Pool (mbp) wrote :

On consideration, although those improvements would be useful, I think
we could land this and add them as enhancements when they're wanted -
maybe when we change bzr to use this.

Revision history for this message
Robert Collins (lifeless) wrote :

On Tue, Nov 29, 2011 at 7:19 PM, Martin Pool <email address hidden> wrote:
> On consideration, although those improvements would be useful, I think
> we could land this and add them as enhancements when they're wanted -
> maybe when we change bzr to use this.

I'd really rather not be hiding ImportError at all - It seems to me
all users are going to want that, so rather than changing the
behaviour in a later release, I'd rather we tweak this now.

Revision history for this message
Robert Collins (lifeless) wrote :

I think this needs a (shallow) patch to testtools to make it trivial to wrap a test with a skip.

Revision history for this message
Robert Collins (lifeless) wrote :
Revision history for this message
Martin Pool (mbp) wrote :

Thanks!
On Apr 4, 2012 8:05 PM, <email address hidden> wrote:

> The proposal to merge lp:~mbp/testscenarios/module-scenarios into
> lp:testscenarios has been updated.
>
> Status: Needs review => Merged
>
> For more details, see:
> https://code.launchpad.net/~mbp/testscenarios/module-scenarios/+merge/80287
> --
> https://code.launchpad.net/~mbp/testscenarios/module-scenarios/+merge/80287
> You are the owner of lp:~mbp/testscenarios/module-scenarios.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches