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

Improve diffing logic and output for test_pydoc.

This commit is contained in:
Georg Brandl 2008-05-20 08:07:36 +00:00
parent bcdafa44f2
commit fb3de1fcd2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/test/test_pydoc.py
View File

@ -190,11 +190,11 @@ def get_pydoc_text(module):
def print_diffs(text1, text2): def print_diffs(text1, text2):
"Prints unified diffs for two texts" "Prints unified diffs for two texts"
lines1 = text1.splitlines() lines1 = text1.splitlines(True)
lines2 = text2.splitlines() lines2 = text2.splitlines(True)
diffs = difflib.unified_diff(lines1, lines2, n=0) diffs = difflib.unified_diff(lines1, lines2, n=0, fromfile='expected',
diffs = list(diffs) # its a generator tofile='got')
print '\n'.join(diffs) print '\n' + ''.join(diffs)
def get_mod_file(module): def get_mod_file(module):
"""Returns the name of the .py file if the module is compiled""" """Returns the name of the .py file if the module is compiled"""
@ -209,14 +209,14 @@ class PyDocDocTest(unittest.TestCase):
mod_file = get_mod_file(pydoc_mod) mod_file = get_mod_file(pydoc_mod)
expected_html = expected_html_pattern % (mod_file, mod_file) expected_html = expected_html_pattern % (mod_file, mod_file)
if result != expected_html: if result != expected_html:
print_diffs(result, expected_html) print_diffs(expected_html, result)
self.fail("outputs are not equal, see diff above") self.fail("outputs are not equal, see diff above")
def test_text_doc(self): def test_text_doc(self):
result = get_pydoc_text(pydoc_mod) result = get_pydoc_text(pydoc_mod)
expected_text = expected_text_pattern % get_mod_file(pydoc_mod) expected_text = expected_text_pattern % get_mod_file(pydoc_mod)
if result != expected_text: if result != expected_text:
print_diffs(result, expected_text) print_diffs(expected_text, result)
self.fail("outputs are not equal, see diff above") self.fail("outputs are not equal, see diff above")
def test_not_here(self): def test_not_here(self):