[Python-checkins] cpython (2.7): Fix test_pydoc failure introduced by e89c39125892. Patch by Berker Peksag.

[charles-francois.natali]

http://hg.python.org/cpython/rev/20e65501cfa4
changeset:   91301:20e65501cfa4
branch:      2.7
parent:      91293:aa5e3f7a5501
user:        Charles-François Natali <cf.natali at gmail.com>
date:        Fri Jun 20 22:57:19 2014 +0100
summary:
  Fix test_pydoc failure introduced by e89c39125892. Patch by Berker Peksag.

files:
  Lib/test/test_pydoc.py |  6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -14,8 +14,8 @@
 import test.test_support
 from collections import namedtuple
 from test.script_helper import assert_python_ok
-from test.test_support import (
-    TESTFN, rmtree, reap_children, captured_stdout, captured_stderr)
+from test.test_support import (TESTFN, rmtree, reap_children, captured_stdout,
+                               captured_stderr, requires_docstrings)
 
 from test import pydoc_mod
 
@@ -300,6 +300,7 @@
 
 class PydocDocTest(unittest.TestCase):
 
+    @requires_docstrings
     @unittest.skipIf(sys.flags.optimize >= 2,
                      "Docstrings are omitted with -O2 and above")
     def test_html_doc(self):
@@ -317,6 +318,7 @@
             print_diffs(expected_html, result)
             self.fail("outputs are not equal, see diff above")
 
+    @requires_docstrings
     @unittest.skipIf(sys.flags.optimize >= 2,
                      "Docstrings are omitted with -O2 and above")
     def test_text_doc(self):

-- 
Repository URL: http://hg.python.org/cpython