Merge lp:~jml/testtools/epytext-fixes into lp:~testtools-committers/testtools/trunk

Proposed by Jonathan Lange
Status: Merged
Merged at revision: 276
Proposed branch: lp:~jml/testtools/epytext-fixes
Merge into: lp:~testtools-committers/testtools/trunk
Diff against target: 35 lines (+5/-5)
2 files modified
testtools/tags.py (+3/-3)
testtools/testresult/real.py (+2/-2)
To merge this branch: bzr merge lp:~jml/testtools/epytext-fixes
Reviewer Review Type Date Requested Status
testtools committers Pending
Review via email: mp+125747@code.launchpad.net

Description of the change

Fixes epytext glitches.

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

Doit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'testtools/tags.py'
--- testtools/tags.py 2012-04-12 16:26:02 +0000
+++ testtools/tags.py 2012-09-21 15:26:50 +0000
@@ -9,9 +9,9 @@
9 def __init__(self, parent=None):9 def __init__(self, parent=None):
10 """Create a new TagContext.10 """Create a new TagContext.
1111
12 :parent: If provided, uses this as the parent context. Any tags that12 :param parent: If provided, uses this as the parent context. Any tags
13 are current on the parent at the time of construction are current13 that are current on the parent at the time of construction are
14 in this context.14 current in this context.
15 """15 """
16 self.parent = parent16 self.parent = parent
17 self._tags = set()17 self._tags = set()
1818
=== modified file 'testtools/testresult/real.py'
--- testtools/testresult/real.py 2012-05-07 02:51:19 +0000
+++ testtools/testresult/real.py 2012-09-21 15:26:50 +0000
@@ -357,12 +357,12 @@
357class ThreadsafeForwardingResult(TestResult):357class ThreadsafeForwardingResult(TestResult):
358 """A TestResult which ensures the target does not receive mixed up calls.358 """A TestResult which ensures the target does not receive mixed up calls.
359359
360 Multiple ``ThreadsafeForwardingResult``s can forward to the same target360 Multiple ``ThreadsafeForwardingResults`` can forward to the same target
361 result, and that target result will only ever receive the complete set of361 result, and that target result will only ever receive the complete set of
362 events for one test at a time.362 events for one test at a time.
363363
364 This is enforced using a semaphore, which further guarantees that tests364 This is enforced using a semaphore, which further guarantees that tests
365 will be sent atomically even if the ``ThreadsafeForwardingResult``s are in365 will be sent atomically even if the ``ThreadsafeForwardingResults`` are in
366 different threads.366 different threads.
367367
368 ``ThreadsafeForwardingResult`` is typically used by368 ``ThreadsafeForwardingResult`` is typically used by

Subscribers

People subscribed via source and target branches