Merge lp:~gz/bzr/require_testtools_0.9.5_for_selftest into lp:bzr

[Martin Packman]

Change minimum required testtools version for selftest to 0.9.5 for unicode fixes

Had hoped to put this off for a little longer, as testtools 0.9.5 was only released at the end of July, but the test in lp:~gz/bzr/escape_selftest_console_output_633216 depends on fixed unicode support.

Why 0.9.5? The changes that allow testtools to work with non-ascii details (tracebacks, logs), were merged for 0.9.4, and 0.9.5 has some fixes for related fallout.

PQM may need its testtools package updating in order for this branch to land.

[Vincent Ladeuil (vila)]

I've filed rt #41340 asking for testtools-0.9.6 to installed in the bzr.dev pqm chroot.

[Vincent Ladeuil (vila)]

Marking as Needs Information until pqm is updated, this doesn't apply to the patch but makes
the pp job easier.

review: Needs Information

[Martin Packman (gz)]

Have merged trunk and PQM has been upgraded so this should be now landable.

[Martin Packman (gz)]

sent to pqm by email

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2010-10-18 17:06:37 +0000
+++ bzrlib/tests/__init__.py	2010-11-19 23:01:59 +0000
@@ -55,8 +55,8 @@
 import testtools
 # nb: check this before importing anything else from within it
 _testtools_version = getattr(testtools, '__version__', ())
-if _testtools_version < (0, 9, 2):
-    raise ImportError("need at least testtools 0.9.2: %s is %r"
+if _testtools_version < (0, 9, 5):
+    raise ImportError("need at least testtools 0.9.5: %s is %r"
         % (testtools.__file__, _testtools_version))
 from testtools import content
 

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- doc/en/release-notes/bzr-2.3.txt	2010-11-18 19:38:28 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2010-11-19 23:01:59 +0000
@@ -103,6 +103,10 @@
   Instead, use '...' as a wildcard if you don't care about the output.
   (Martin Pool, #637830)
 
+* Bump minimum testtools version required to run ``bzr selftest`` from 0.9.2
+  to 0.9.5 which will allow tests that need the fixed unicode handling to be
+  written. (Martin [gz])
+
 
 bzr 2.3b3
 #########