Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-47042: Fix testing the HTML output in test_pydoc (GH-31959) 

Previously it tested that that the actual output contains every non-whitespace
character from the expected output (ignoring order and repetitions).

Now it will test that the actual output contains the same lines as the expected
output, in the same order, ignoring indentation and empty lines.
This commit is contained in:
Serhiy Storchaka 2022-03-17 18:32:53 +02:00 committed by GitHub
parent 3011a097bd
commit a5d246066b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/test/test_pydoc.py
View File

@ -340,9 +340,10 @@ def html2text(html):
Tailored for pydoc tests only.
"""
return pydoc.replace(
re.sub("<.*?>", "", html),
"&nbsp;", " ", "&gt;", ">", "&lt;", "<")
html = html.replace("<dd>", "\n")
html = re.sub("<.*?>", "", html)
html = pydoc.replace(html, "&nbsp;", " ", "&gt;", ">", "&lt;", "<")
return html
class PydocBaseTest(unittest.TestCase):
@ -384,9 +385,12 @@ class PydocDocTest(unittest.TestCase):
def test_html_doc(self):
result, doc_loc = get_pydoc_html(pydoc_mod)
text_result = html2text(result)
expected_lines = [line.strip() for line in html2text_of_expected if line]
for line in expected_lines:
self.assertIn(line, text_result)
text_lines = [line.strip() for line in text_result.splitlines()]
text_lines = [line for line in text_lines if line]
del text_lines[1]
expected_lines = html2text_of_expected.splitlines()
expected_lines = [line.strip() for line in expected_lines if line]
self.assertEqual(text_lines, expected_lines)
mod_file = inspect.getabsfile(pydoc_mod)
mod_url = urllib.parse.quote(mod_file)
self.assertIn(mod_url, result)