Merge lp:~lifeless/subunit/done into lp:~subunit/subunit/trunk

Proposed by Robert Collins
Status: Merged
Approved by: Jonathan Lange
Approved revision: 65
Merged at revision: not available
Proposed branch: lp:~lifeless/subunit/done
Merge into: lp:~subunit/subunit/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~lifeless/subunit/done
Reviewer Review Type Date Requested Status
Jonathan Lange Approve
Jelmer Vernooij Approve
Review via email: mp+5346@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

Its good. Vote now for world peace.

Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
Jonathan Lange (jml) wrote :

Win.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README'
--- README 2009-02-28 09:27:25 +0000
+++ README 2009-04-07 21:28:28 +0000
@@ -121,7 +121,7 @@
121def test_suite():121def test_suite():
122 result = subunit.IsolatedTestSuite()122 result = subunit.IsolatedTestSuite()
123 loader = unittest.TestLoader()123 loader = unittest.TestLoader()
124 result.addTestCase(loader.loadTestsFromName(__name__))124 result.addTest(loader.loadTestsFromName(__name__))
125 return result125 return result
126126
127# you can test the result of test_suite() as follows (or in any normal Python127# you can test the result of test_suite() as follows (or in any normal Python
128128
=== modified file 'python/subunit/__init__.py'
--- python/subunit/__init__.py 2009-03-18 09:33:42 +0000
+++ python/subunit/__init__.py 2009-04-08 13:00:52 +0000
@@ -342,6 +342,9 @@
342 """Mark a test as starting its test run."""342 """Mark a test as starting its test run."""
343 self._stream.write("test: %s\n" % test.id())343 self._stream.write("test: %s\n" % test.id())
344344
345 def done(self):
346 """Obey the testtools result.done() interface."""
347
345348
346def RemoteError(description=""):349def RemoteError(description=""):
347 if description == "":350 if description == "":

Subscribers

People subscribed via source and target branches