mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use test.script_helper in test_pydoc

Browse source
This commit is contained in:
Antoine Pitrou 2011-07-15 22:42:12 +02:00
parent a6e81a23b3
commit f7f54759b5
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/test/test_pydoc.py
View file

@ -15,11 +15,12 @@ import textwrap
from io import StringIO from io import StringIO
from collections import namedtuple from collections import namedtuple
from contextlib import contextmanager from contextlib import contextmanager
from test.script_helper import assert_python_ok
from test.support import ( from test.support import (
TESTFN, forget, rmtree, EnvironmentVarGuard, TESTFN, forget, rmtree, EnvironmentVarGuard,
reap_children, reap_threads, captured_output, captured_stdout, unlink reap_children, reap_threads, captured_output, captured_stdout, unlink
) )
from test import pydoc_mod from test import pydoc_mod
try: try:
@ -201,14 +202,14 @@ missing_pattern = "no Python documentation found for '%s'"
# output pattern for module with bad imports # output pattern for module with bad imports
badimport_pattern = "problem in %s - ImportError: No module named %s" badimport_pattern = "problem in %s - ImportError: No module named %s"
def run_pydoc(module_name, *args): def run_pydoc(module_name, *args, **env):
""" """
Runs pydoc on the specified module. Returns the stripped Runs pydoc on the specified module. Returns the stripped
output of pydoc. output of pydoc.
""" """
cmd = [sys.executable, pydoc.__file__, " ".join(args), module_name] args = args + (module_name,)
output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0] rc, out, err = assert_python_ok(pydoc.__file__, *args, **env)
return output.strip() return out.strip()
def get_pydoc_html(module): def get_pydoc_html(module):
"Returns pydoc generated output as html" "Returns pydoc generated output as html"
@ -307,19 +308,20 @@ class PydocDocTest(unittest.TestCase):
def newdirinpath(dir): def newdirinpath(dir):
os.mkdir(dir) os.mkdir(dir)
sys.path.insert(0, dir) sys.path.insert(0, dir)
yield try:
sys.path.pop(0) yield
rmtree(dir) finally:
sys.path.pop(0)
rmtree(dir)
with newdirinpath(TESTFN), EnvironmentVarGuard() as env: with newdirinpath(TESTFN):
env['PYTHONPATH'] = TESTFN
fullmodname = os.path.join(TESTFN, modname) fullmodname = os.path.join(TESTFN, modname)
sourcefn = fullmodname + os.extsep + "py" sourcefn = fullmodname + os.extsep + "py"
for importstring, expectedinmsg in testpairs: for importstring, expectedinmsg in testpairs:
with open(sourcefn, 'w') as f: with open(sourcefn, 'w') as f:
f.write("import {}\n".format(importstring)) f.write("import {}\n".format(importstring))
try: try:
result = run_pydoc(modname).decode("ascii") result = run_pydoc(modname, PYTHONPATH=TESTFN).decode("ascii")
finally: finally:
forget(modname) forget(modname)
expected = badimport_pattern % (modname, expectedinmsg) expected = badimport_pattern % (modname, expectedinmsg)