summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_pydoc.py
diff options
context:
space:
mode:
authorCharles-François Natali <cf.natali@gmail.com>2014-06-20 21:57:19 (GMT)
committerCharles-François Natali <cf.natali@gmail.com>2014-06-20 21:57:19 (GMT)
commit94919a44a26b135108788f5a7bd5604189c3febe (patch)
treeb668448b8b2ebedcb8087583431eeb70f5696bd0 /Lib/test/test_pydoc.py
parent98fbdd682908638b54742fcf5107137170b2e645 (diff)
downloadcpython-94919a44a26b135108788f5a7bd5604189c3febe.zip
cpython-94919a44a26b135108788f5a7bd5604189c3febe.tar.gz
cpython-94919a44a26b135108788f5a7bd5604189c3febe.tar.bz2
Fix test_pydoc failure introduced by e89c39125892. Patch by Berker Peksag.
Diffstat (limited to 'Lib/test/test_pydoc.py')
-rw-r--r--Lib/test/test_pydoc.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 6d27a30..c11c06b 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -14,8 +14,8 @@ import types
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 PydocBaseTest(unittest.TestCase):
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 @@ class PydocDocTest(unittest.TestCase):
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):