Rev 6523: (vila) Avoid test sphinx-related failures now that we don't have direct in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6523 [merge]
revision-id: pqm at pqm.ubuntu.com-20120419102945-4fmzcqhvnpwbw61b
parent: pqm at pqm.ubuntu.com-20120416113553-1vnossk7c384rp4q
parent: v.ladeuil+lp at free.fr-20120417121827-nmhw3ax9fefi0r44
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2012-04-19 10:29:45 +0000
message:
  (vila) Avoid test sphinx-related failures now that we don't have direct
   sphinx anymore. (Vincent Ladeuil)
modified:
  bzrlib/tests/test_utextwrap.py test_utextwrap.py-20110504151300-vdvrs19wd20a5cy0-1
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
=== modified file 'bzrlib/tests/test_utextwrap.py'
--- a/bzrlib/tests/test_utextwrap.py	2011-05-28 06:44:01 +0000
+++ b/bzrlib/tests/test_utextwrap.py	2012-04-17 12:18:27 +0000
@@ -171,16 +171,6 @@
 
 
     def setup_both(testcase, base_class, reused_class):
-
-        if (features.sphinx.available()):
-            # Until https://bitbucket.org/birkenfeld/sphinx/issue/706 is fixed,
-            # we can't run these tests when sphinx <= 1.0.1 as it breaks
-            # textwrap.TextWrapper.wordsep_re
-            version = tuple(map(int,
-                                features.sphinx.module.__version__.split('.')))
-            if version <= (1, 0, 7):
-                raise tests.TestSkipped(
-                    'sphinx textwrap monkeypatch breaks utextwrap')
         super(base_class, testcase).setUp()
         override_textwrap_symbols(testcase)
         reused_class.setUp(testcase)

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-04-16 11:08:11 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-04-17 12:18:27 +0000
@@ -67,10 +67,9 @@
 Testing
 *******
 
-.. Fixes and changes that are only relevant to bzr's test framework and 
-   suite.  This can include new facilities for writing tests, fixes to 
-   spurious test failures and changes to the way things should be tested.
-
+* Fix test failures by removing a remaining reference to ``features.sphinx``
+  which isn't needed anymore since we don't test the texinfo sphinx builder
+  anymore either. (Vincent Ladeuil)
 
 bzr 2.6b1
 #########