Python Fixtures

Merge lp://staging/~mbp/python-fixtures/timeout into lp://staging/~python-fixtures/python-fixtures/trunk

  1. timeout
  2. Merge into trunk
Proposed by Martin Pool
Status: Merged
Merged at revision: 43
Proposed branch: lp://staging/~mbp/python-fixtures/timeout
Merge into: lp://staging/~python-fixtures/python-fixtures/trunk
Diff against target: 234 lines (+162/-0)
7 files modified
NEWS (+2/-0)
README (+18/-0)
lib/fixtures/__init__.py (+4/-0)
lib/fixtures/_fixtures/__init__.py (+6/-0)
lib/fixtures/_fixtures/timeout.py (+64/-0)
lib/fixtures/tests/_fixtures/__init__.py (+1/-0)
lib/fixtures/tests/_fixtures/test_timeout.py (+67/-0)
To merge this branch: bzr merge lp://staging/~mbp/python-fixtures/timeout
Reviewer Review Type Date Requested Status
python-fixtures committers Pending
Review via email: mp+83721@code.staging.launchpad.net

Description of the change

This adds a new TestTimeout based on https://code.launchpad.net/~mbp/bzr/test-timeout/+merge/83559

There are two modes, because I suspect people will have different preferences for being relatively sure things will stop vs getting a clean error.

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

We discussed on IRC.

Could you please
rename to 'Timeout', and change from talking about use in tests (e.g. 1 per test) to use in general (can only use one of these at a time because it builds on SIGALARM).

lp://staging/~mbp/python-fixtures/timeout updated
44. By Martin Pool

Rename to just 'Timeout'; other review cleanups

45. By Martin Pool

Rename to just TimeoutException, and remove more connections to Timeout only being used in tests

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

I've merged this. I noted some race conditions while doing so, you may want to apply them to bzrlib's version (or start using fixtures :P).

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