floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to ini config parameter

This commit is contained in:
Andrey Paramonov 2018-12-12 13:19:39 +03:00
parent 0bccfc44a7
commit 316cca204f
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/_pytest/junitxml.py
View File

@ -314,15 +314,6 @@ def pytest_addoption(parser):
default=None, default=None,
help="prepend prefix to classnames in junit-xml output", help="prepend prefix to classnames in junit-xml output",
) )
group.addoption(
"--junittime",
"--junit-time",
action="store",
metavar="str",
default="total",
# choices=["total", "call"],
help='duration time to report: "total" (default), "call"',
)
parser.addini( parser.addini(
"junit_suite_name", "Test suite name for JUnit report", default="pytest" "junit_suite_name", "Test suite name for JUnit report", default="pytest"
) )
@ -332,6 +323,9 @@ def pytest_addoption(parser):
"one of no|system-out|system-err", "one of no|system-out|system-err",
default="no", default="no",
) # choices=['no', 'stdout', 'stderr']) ) # choices=['no', 'stdout', 'stderr'])
parser.addini(
"junit_time", "Duration time to report: one of total|call", default="total"
) # choices=['total', 'call'])
def pytest_configure(config): def pytest_configure(config):
@ -343,7 +337,7 @@ def pytest_configure(config):
config.option.junitprefix, config.option.junitprefix,
config.getini("junit_suite_name"), config.getini("junit_suite_name"),
config.getini("junit_logging"), config.getini("junit_logging"),
config.option.junittime, config.getini("junit_time"),
) )
config.pluginmanager.register(config._xml) config.pluginmanager.register(config._xml)
@ -372,7 +366,12 @@ def mangle_test_address(address):
class LogXML(object): class LogXML(object):
def __init__( def __init__(
self, logfile, prefix, suite_name="pytest", logging="no", report_duration=None self,
logfile,
prefix,
suite_name="pytest",
logging="no",
report_duration="total",
): ):
logfile = os.path.expanduser(os.path.expandvars(logfile)) logfile = os.path.expanduser(os.path.expandvars(logfile))
self.logfile = os.path.normpath(os.path.abspath(logfile)) self.logfile = os.path.normpath(os.path.abspath(logfile))
@ -513,11 +512,7 @@ class LogXML(object):
"""accumulates total duration for nodeid from given report and updates """accumulates total duration for nodeid from given report and updates
the Junit.testcase with the new total if already created. the Junit.testcase with the new total if already created.
""" """
if ( if self.report_duration == "total" or report.when == self.report_duration:
not self.report_duration
or self.report_duration == "total"
or report.when == self.report_duration
):
reporter = self.node_reporter(report) reporter = self.node_reporter(report)
reporter.duration += getattr(report, "duration", 0.0) reporter.duration += getattr(report, "duration", 0.0)

3
testing/test_junitxml.py
View File

@ -165,7 +165,7 @@ class TestPython(object):
time.sleep(0.01) time.sleep(0.01)
""" """
) )
result, dom = runandparse(testdir, "--junit-time=call") result, dom = runandparse(testdir, "-o", "junit_time=call")
node = dom.find_first_by_tag("testsuite") node = dom.find_first_by_tag("testsuite")
tnode = node.find_first_by_tag("testcase") tnode = node.find_first_by_tag("testcase")
val = tnode["time"] val = tnode["time"]
@ -745,7 +745,6 @@ def test_dont_configure_on_slaves(tmpdir):
junitprefix = None junitprefix = None
# XXX: shouldnt need tmpdir ? # XXX: shouldnt need tmpdir ?
xmlpath = str(tmpdir.join("junix.xml")) xmlpath = str(tmpdir.join("junix.xml"))
junittime = None
register = gotten.append register = gotten.append
fake_config = FakeConfig() fake_config = FakeConfig()