Merged revisions 64095 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64095 | amaury.forgeotdarc | 2008-06-10 16:37:15 -0500 (Tue, 10 Jun 2008) | 3 lines

  Correct test_pydoc for win32 platforms, to account for normalized URLs:
  C:\temp => file:///C|temp/
........
This commit is contained in:
Benjamin Peterson 2008-06-14 23:04:46 +00:00
parent b4fb6e4d27
commit c5e94641bf
1 changed files with 6 additions and 1 deletions

View File

@ -231,7 +231,12 @@ class PyDocDocTest(unittest.TestCase):
def test_html_doc(self): def test_html_doc(self):
result, doc_loc = get_pydoc_html(pydoc_mod) result, doc_loc = get_pydoc_html(pydoc_mod)
mod_file = inspect.getabsfile(pydoc_mod) mod_file = inspect.getabsfile(pydoc_mod)
expected_html = expected_html_pattern % (mod_file, mod_file, doc_loc) if sys.platform == 'win32':
import nturl2path
mod_url = nturl2path.pathname2url(mod_file)
else:
mod_url = mod_file
expected_html = expected_html_pattern % (mod_url, mod_file, doc_loc)
if result != expected_html: if result != expected_html:
print_diffs(expected_html, result) print_diffs(expected_html, result)
self.fail("outputs are not equal, see diff above") self.fail("outputs are not equal, see diff above")