testtools-dev team mailing list archive

[Michael Hudson-Doyle <michael.hudson@xxxxxxxxxx>]

Michael Hudson-Doyle has proposed merging lp:~mwhudson/testtools/trivial into lp:testtools.

Requested reviews:
  testtools developers (testtools-dev)


Two trivial changes: a simple fix to a test that's broken on trunk, and adding .testrepository to .bzrignore (I'm amazed this wasn't there already!)
-- 
https://code.launchpad.net/~mwhudson/testtools/trivial/+merge/43485
Your team testtools developers is requested to review the proposed merge of lp:~mwhudson/testtools/trivial into lp:testtools.

=== modified file '.bzrignore'
--- .bzrignore	2010-07-29 17:19:32 +0000
+++ .bzrignore	2010-12-12 23:46:09 +0000
@@ -6,3 +6,4 @@
 TAGS
 apidocs
 _trial_temp
+./.testrepository

=== modified file 'testtools/tests/test_run.py'
--- testtools/tests/test_run.py	2010-12-10 23:38:16 +0000
+++ testtools/tests/test_run.py	2010-12-12 23:46:09 +0000
@@ -52,7 +52,7 @@
         if fixtures is None:
             self.skipTest("Need fixtures")
         package = self.useFixture(SampleTestFixture())
-        out = StringIO.StringIO()
+        out = StringIO()
         # We load two tests - one that exists and one that doesn't, and we
         # should get the one that exists and neither the one that doesn't nor
         # the unmentioned one that does.