-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
Expose log_cli
as a CLI parser option.
#3190
Merged
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Passing `--log-cli-level` in the command-line now automatically activates live logging. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -366,6 +366,48 @@ def test_log_cli(request): | |
assert result.ret == 0 | ||
|
||
|
||
@pytest.mark.parametrize('cli_args', ['', | ||
'--log-level=WARNING', | ||
'--log-file-level=WARNING', | ||
'--log-cli-level=WARNING']) | ||
def test_log_cli_auto_enable(testdir, request, cli_args): | ||
"""Check that live logs are enabled if --log-level or --log-cli-level is passed on the CLI. | ||
It should not be auto enabled if the same configs are set on the INI file. | ||
""" | ||
testdir.makepyfile(''' | ||
import pytest | ||
import logging | ||
|
||
def test_log_1(): | ||
logging.info("log message from test_log_1 not to be shown") | ||
logging.warning("log message from test_log_1") | ||
|
||
''') | ||
testdir.makeini(''' | ||
[pytest] | ||
log_level=INFO | ||
log_cli_level=INFO | ||
''') | ||
|
||
result = testdir.runpytest(cli_args) | ||
if cli_args == '--log-cli-level=WARNING': | ||
result.stdout.fnmatch_lines([ | ||
'*::test_log_1 ', | ||
'*-- live log call --*', | ||
'*WARNING*log message from test_log_1*', | ||
'PASSED *100%*', | ||
'=* 1 passed in *=', | ||
]) | ||
assert 'INFO' not in result.stdout.str() | ||
else: | ||
result.stdout.fnmatch_lines([ | ||
'*test_log_cli_auto_enable*100%*', | ||
'=* 1 passed in *=', | ||
]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please also ensure that no logging message is shown: assert 'INFO' not in result.stdout.str()
assert 'WARNING' not in result.stdout.str() |
||
assert 'INFO' not in result.stdout.str() | ||
assert 'WARNING' not in result.stdout.str() | ||
|
||
|
||
def test_log_file_cli(testdir): | ||
# Default log file level | ||
testdir.makepyfile(''' | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thx for introducing a method for this! This improves the readability IMO.