Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix verbosity bug in --collect-only #5391

Merged
merged 1 commit into from
Jun 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog/5383.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
``-q`` has again an impact on the style of the collected items
(``--collect-only``) when ``--log-cli-level`` is used.
13 changes: 9 additions & 4 deletions src/_pytest/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,6 @@ def __init__(self, config):
"""
self._config = config

# enable verbose output automatically if live logging is enabled
if self._log_cli_enabled() and config.getoption("verbose") < 1:
config.option.verbose = 1

self.print_logs = get_option_ini(config, "log_print")
self.formatter = self._create_formatter(
get_option_ini(config, "log_format"),
Expand Down Expand Up @@ -628,6 +624,15 @@ def pytest_sessionstart(self):
@pytest.hookimpl(hookwrapper=True)
def pytest_runtestloop(self, session):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit surprised that this hook is called even when --collect-only is used

"""Runs all collected test items."""

if session.config.option.collectonly:
yield
return

if self._log_cli_enabled() and self._config.getoption("verbose") < 1:
# setting verbose flag is needed to avoid messy test progress output
self._config.option.verbose = 1

with self.live_logs_context():
if self.log_file_handler is not None:
with catching_logs(self.log_file_handler, level=self.log_file_level):
Expand Down
43 changes: 37 additions & 6 deletions testing/logging/test_reporting.py
Original file line number Diff line number Diff line change
Expand Up @@ -916,14 +916,45 @@ def test_collection_live_logging(testdir):

result = testdir.runpytest("--log-cli-level=INFO")
result.stdout.fnmatch_lines(
[
"collecting*",
"*--- live log collection ---*",
"*Normal message*",
"collected 0 items",
]
["*--- live log collection ---*", "*Normal message*", "collected 0 items"]
)


@pytest.mark.parametrize("verbose", ["", "-q", "-qq"])
def test_collection_collect_only_live_logging(testdir, verbose):
testdir.makepyfile(
"""
def test_simple():
pass
"""
)

result = testdir.runpytest("--collect-only", "--log-cli-level=INFO", verbose)

expected_lines = []

if not verbose:
expected_lines.extend(
[
"*collected 1 item*",
"*<Module test_collection_collect_only_live_logging.py>*",
"*no tests ran*",
]
)
elif verbose == "-q":
assert "collected 1 item*" not in result.stdout.str()
expected_lines.extend(
[
"*test_collection_collect_only_live_logging.py::test_simple*",
"no tests ran in * seconds",
]
)
elif verbose == "-qq":
assert "collected 1 item*" not in result.stdout.str()
expected_lines.extend(["*test_collection_collect_only_live_logging.py: 1*"])

result.stdout.fnmatch_lines(expected_lines)


def test_collection_logging_to_file(testdir):
log_file = testdir.tmpdir.join("pytest.log").strpath
Expand Down