Rev 6050: (jelmer) Fix support for testtools 0.9.12. (Jelmer Vernooij) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Aug 3 17:46:00 UTC 2011
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6050 [merge]
revision-id: pqm at pqm.ubuntu.com-20110803174555-pmpu6ms4lgjudxzf
parent: pqm at pqm.ubuntu.com-20110803045759-1lrr8eymve8ofldr
parent: jelmer at samba.org-20110803143506-ge6yhn8sccyx5d9r
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-08-03 17:45:55 +0000
message:
(jelmer) Fix support for testtools 0.9.12. (Jelmer Vernooij)
modified:
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2011-08-02 01:10:27 +0000
+++ b/bzrlib/tests/test_selftest.py 2011-08-03 14:34:34 +0000
@@ -29,6 +29,7 @@
from testtools import (
ExtendedToOriginalDecorator,
MultiTestResult,
+ __version__ as testtools_version,
)
from testtools.content import Content
from testtools.content_type import ContentType
@@ -1072,17 +1073,31 @@
self.expectFailure("No absolute truth", self.assertTrue, True)
runner = tests.TextTestRunner(stream=StringIO())
result = self.run_test_runner(runner, Test("test_truth"))
- self.assertContainsRe(runner.stream.getvalue(),
- "=+\n"
- "FAIL: \\S+\.test_truth\n"
- "-+\n"
- "(?:.*\n)*"
- "No absolute truth\n"
- "(?:.*\n)*"
- "-+\n"
- "Ran 1 test in .*\n"
- "\n"
- "FAILED \\(failures=1\\)\n\\Z")
+ if testtools_version <= (0, 9, 11):
+ self.assertContainsRe(runner.stream.getvalue(),
+ "=+\n"
+ "FAIL: \\S+\.test_truth\n"
+ "-+\n"
+ "(?:.*\n)*"
+ "No absolute truth\n"
+ "(?:.*\n)*"
+ "-+\n"
+ "Ran 1 test in .*\n"
+ "\n"
+ "FAILED \\(failures=1\\)\n\\Z")
+ else:
+ self.assertContainsRe(runner.stream.getvalue(),
+ "=+\n"
+ "FAIL: \\S+\.test_truth\n"
+ "-+\n"
+ "Empty attachments:\n"
+ " log\n"
+ "\n"
+ "reason: {{{No absolute truth}}}\n"
+ "-+\n"
+ "Ran 1 test in .*\n"
+ "\n"
+ "FAILED \\(failures=1\\)\n\\Z")
def test_result_decorator(self):
# decorate results
@@ -1247,11 +1262,14 @@
lambda trace=False: "ascii")
result = self.run_test_runner(tests.TextTestRunner(stream=out),
FailureWithUnicode("test_log_unicode"))
- self.assertContainsRe(out.getvalue(),
- "Text attachment: log\n"
- "-+\n"
- "\d+\.\d+ \\\\u2606\n"
- "-+\n")
+ if testtools_version > (0, 9, 11):
+ self.assertContainsRe(out.getvalue(), "log: {{{\d+\.\d+ \\\\u2606}}}")
+ else:
+ self.assertContainsRe(out.getvalue(),
+ "Text attachment: log\n"
+ "-+\n"
+ "\d+\.\d+ \\\\u2606\n"
+ "-+\n")
class SampleTestCase(tests.TestCase):
@@ -1736,14 +1754,16 @@
result = self._run_test('test_fail')
self.assertEqual(1, len(result.failures))
result_content = result.failures[0][1]
- self.assertContainsRe(result_content, 'Text attachment: log')
+ if testtools_version < (0, 9, 12):
+ self.assertContainsRe(result_content, 'Text attachment: log')
self.assertContainsRe(result_content, 'this was a failing test')
def test_error_has_log(self):
result = self._run_test('test_error')
self.assertEqual(1, len(result.errors))
result_content = result.errors[0][1]
- self.assertContainsRe(result_content, 'Text attachment: log')
+ if testtools_version < (0, 9, 12):
+ self.assertContainsRe(result_content, 'Text attachment: log')
self.assertContainsRe(result_content, 'this test errored')
def test_skip_has_no_log(self):
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt 2011-08-02 18:14:55 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt 2011-08-03 14:35:06 +0000
@@ -142,6 +142,8 @@
due to the order that `build_snapshot` performs its actions.
(Andrew Bennetts)
+* Fix compatibility with testtools 0.9.12. (Jelmer Vernooij, #815423)
+
* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
just compares the bytes in the dirstate file to its pristine state,
rather than opening the WorkingTree and calling ``last_revision()``.
More information about the bazaar-commits
mailing list