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

Fix linting

This commit is contained in:
Bruno Oliveira 2018-12-11 15:16:11 -02:00
parent cfbd387a5d
commit a44776ed48
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/_pytest/junitxml.py
View File

@ -371,8 +371,9 @@ def mangle_test_address(address):
class LogXML(object): class LogXML(object):
def __init__(self, logfile, prefix, suite_name="pytest", logging="no", def __init__(
report_duration=None): self, logfile, prefix, suite_name="pytest", logging="no", report_duration=None
):
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))
self.prefix = prefix self.prefix = prefix
@ -512,8 +513,11 @@ 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 not self.report_duration or self.report_duration == "total" or \ if (
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)