jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaner implementation of #1749.

This commit is contained in:
Romain Dorgueil 2016-07-23 16:18:12 +02:00
parent d5a70acd48
commit 51fa244650
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
_pytest/doctest.py
View File

@ -8,6 +8,19 @@ from _pytest._code.code import ExceptionInfo, ReprFileLocation, TerminalRepr
from _pytest.fixtures import FixtureRequest from _pytest.fixtures import FixtureRequest
DOCTEST_REPORT_CHOICE_NONE = 'none'
DOCTEST_REPORT_CHOICE_CDIFF = 'cdiff'
DOCTEST_REPORT_CHOICE_NDIFF = 'ndiff'
DOCTEST_REPORT_CHOICE_UDIFF = 'udiff'
DOCTEST_REPORT_CHOICE_ONLY_FIRST_FAILURE = 'only_first_failure'
DOCTEST_REPORT_CHOICES = (
DOCTEST_REPORT_CHOICE_NONE,
DOCTEST_REPORT_CHOICE_CDIFF,
DOCTEST_REPORT_CHOICE_NDIFF,
DOCTEST_REPORT_CHOICE_UDIFF,
DOCTEST_REPORT_CHOICE_ONLY_FIRST_FAILURE,
)
def pytest_addoption(parser): def pytest_addoption(parser):
parser.addini('doctest_optionflags', 'option flags for doctests', parser.addini('doctest_optionflags', 'option flags for doctests',
@ -20,7 +33,7 @@ def pytest_addoption(parser):
group.addoption("--doctest-report", group.addoption("--doctest-report",
type=str.lower, default="udiff", type=str.lower, default="udiff",
help="choose another output format for diffs on doctest failure", help="choose another output format for diffs on doctest failure",
choices=sorted(_get_report_choices_keys()), choices=DOCTEST_REPORT_CHOICES,
dest="doctestreport") dest="doctestreport")
group.addoption("--doctest-glob", group.addoption("--doctest-glob",
action="append", default=[], metavar="pat", action="append", default=[], metavar="pat",
@ -98,7 +111,7 @@ class DoctestItem(pytest.Item):
message = excinfo.type.__name__ message = excinfo.type.__name__
reprlocation = ReprFileLocation(filename, lineno, message) reprlocation = ReprFileLocation(filename, lineno, message)
checker = _get_checker() checker = _get_checker()
REPORT_UDIFF = _get_report_choices().get(self.config.getoption("doctestreport")) REPORT_UDIFF = _get_report_choice(self.config.getoption("doctestreport"))
if lineno is not None: if lineno is not None:
lines = doctestfailure.test.docstring.splitlines(False) lines = doctestfailure.test.docstring.splitlines(False)
# add line numbers to the left of the error message # add line numbers to the left of the error message
@ -295,25 +308,20 @@ def _get_allow_bytes_flag():
return doctest.register_optionflag('ALLOW_BYTES') return doctest.register_optionflag('ALLOW_BYTES')
def _get_report_choices_keys(): def _get_report_choice(key):
""" """
Returns the report choices keys. Separate function (see just below) because this is used to declare options and This function returns the actual `doctest` module flag value, we want to do it as late as possible to avoid
we can't import the doctest module at that time. importing `doctest` and all its dependencies when parsing options, as it adds overhead and breaks tests.
"""
return ('udiff', 'cdiff', 'ndiff', 'only_first_failure', 'none', )
def _get_report_choices():
"""
See `_get_report_choices_keys` to understand why this strange implementation. Be careful with order, the values
order should be the same as the returned keys above.
""" """
import doctest import doctest
return dict(
zip( return {
_get_report_choices_keys(), DOCTEST_REPORT_CHOICE_UDIFF: doctest.REPORT_UDIFF,
(doctest.REPORT_UDIFF, doctest.REPORT_CDIFF, doctest.REPORT_NDIFF, doctest.REPORT_ONLY_FIRST_FAILURE, 0, ) DOCTEST_REPORT_CHOICE_CDIFF: doctest.REPORT_CDIFF,
) DOCTEST_REPORT_CHOICE_NDIFF: doctest.REPORT_NDIFF,
) DOCTEST_REPORT_CHOICE_ONLY_FIRST_FAILURE: doctest.REPORT_ONLY_FIRST_FAILURE,
DOCTEST_REPORT_CHOICE_NONE: 0,
}[key]
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def doctest_namespace(): def doctest_namespace():