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

Change wording from 'cmd' to 'cli'

This commit is contained in:
ziebam 2022-02-19 22:53:05 +01:00
parent 0998c84eb2
commit 4b5589e1bb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/_pytest/logging.py
View File

@ -560,8 +560,8 @@ class LoggingPlugin:
if not os.path.isdir(directory): if not os.path.isdir(directory):
os.makedirs(directory) os.makedirs(directory)
# Log file should be relative to cwd when passed as a cmd argument and # Log file should be relative to invocation location when passed as a cli argument
# relative to the config file otherwise. # and relative to the config file otherwise.
is_inifile_argument = "--log-file" not in config.invocation_params.args is_inifile_argument = "--log-file" not in config.invocation_params.args
if config.inipath is not None and is_inifile_argument: if config.inipath is not None and is_inifile_argument:
log_file = os.path.join(config.inipath.parent, log_file) log_file = os.path.join(config.inipath.parent, log_file)

2
testing/logging/test_reporting.py
View File

@ -1221,7 +1221,7 @@ def test_log_file_in_subdir_when_specified_and_pytest_invoked_in_subdir(
assert "tox.ini" not in files_in_subdir assert "tox.ini" not in files_in_subdir
def test_log_file_relative_to_invocation_dir_when_passed_as_cmd_argument( def test_log_file_relative_to_invocation_dir_when_passed_as_cli_argument(
pytester, monkeypatch pytester, monkeypatch
): ):
"""PR #7350 comment related to issue #7350 (https://github.com/pytest-dev/pytest/pull/7350#pullrequestreview-429803796). """PR #7350 comment related to issue #7350 (https://github.com/pytest-dev/pytest/pull/7350#pullrequestreview-429803796).