From e868bb647d29781d0c56fab19482f7f98f276d47 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 1 Jun 2019 23:53:03 +0200 Subject: [PATCH 1/2] remove commented code --- src/_pytest/_code/code.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py index 9644c61ec..b0b4d6531 100644 --- a/src/_pytest/_code/code.py +++ b/src/_pytest/_code/code.py @@ -910,7 +910,6 @@ class ReprEntry(TerminalRepr): for line in self.lines: red = line.startswith("E ") tw.line(line, bold=True, red=red) - # tw.line("") return if self.reprfuncargs: self.reprfuncargs.toterminal(tw) From 75cda6de53ebb704f3026a32b448e864eee3dba9 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 9 Jun 2019 11:54:29 +0200 Subject: [PATCH 2/2] tox: coverage: use -m with coverage-report --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 7e5b182f6..1f8d10451 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ envlist = commands = {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:{env:_PYTEST_TOX_DEFAULT_POSARGS:}} coverage: coverage combine - coverage: coverage report + coverage: coverage report -m passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS setenv = _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_PEXPECT:} {env:_PYTEST_TOX_POSARGS_TWISTED:} {env:_PYTEST_TOX_POSARGS_XDIST:}