Merge lp:~vila/testtools/trunk into lp:~testtools-committers/testtools/trunk

[Vincent Ladeuil]

Two small fixes here.

1) The doc for test authors has a typo.

2) While trying to reuse testtools.run.TestProgram I ran into the case where
   I didn't provide a testRunner argument. The default handling seems to have
   been imported from python where 'runner' is defined. That's the case here so
   I went with what seems to be a sane default.

[Jonathan Lange (jml)]

Thanks!

review: Approve

=== modified file 'doc/for-test-authors.rst'
--- doc/for-test-authors.rst	2012-01-29 14:08:39 +0000
+++ doc/for-test-authors.rst	2012-11-29 11:44:24 +0000
@@ -432,7 +432,7 @@
   def test_keys_equal(self):
       x = {'a': 1, 'b': 2}
       y = {'a': 2, 'b': 3}
-      self.assertThat(a, KeysEqual(b))
+      self.assertThat(x, KeysEqual(y))
 
 
 MatchesRegex

=== modified file 'testtools/run.py'
--- testtools/run.py	2012-10-17 22:38:13 +0000
+++ testtools/run.py	2012-11-29 11:44:24 +0000
@@ -307,7 +307,7 @@
             and getattr(unittest, 'installHandler', None) is not None):
             unittest.installHandler()
         if self.testRunner is None:
-            self.testRunner = runner.TextTestRunner
+            self.testRunner = TestToolsTestRunner(sys.stdout)
         if isinstance(self.testRunner, classtypes()):
             try:
                 testRunner = self.testRunner(verbosity=self.verbosity,