Merge branch from Vincent, adding NEWS

This commit is contained in:
Jonathan Lange
2012-12-15 14:11:14 +00:00
4 changed files with 7 additions and 2 deletions

View File

@@ -16,6 +16,7 @@ The testtools authors are:
* Christian Kampka
* Gavin Panella
* Martin Pool
* Vincent Ladeuil
and are collectively referred to as "testtools developers".

4
NEWS
View File

@@ -12,6 +12,10 @@ Improvements
* ``AnyMatch`` added, a new matcher that matches when any item in a collection
matches the given matcher. (Jonathan Lange)
* Spelling corrections to documentation. (Vincent Ladeuil)
* ``TestProgram`` now has a sane default for its ``testRunner`` argument.
(Vincent Ladeuil)
0.9.22
~~~~~~

View File

@@ -432,7 +432,7 @@ example::
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

View File

@@ -307,7 +307,7 @@ class TestProgram(object):
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,