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

Add commands & tests for CLI flag `--config-file` 

Signed-off-by: Chris Mahoney <chrismahoey@hotmail.com>
This commit is contained in:
Chris Mahoney 2023-05-26 08:19:09 +10:00
parent 8450d888cf
commit af49dc06b3
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/_pytest/main.py
View File

@ -122,11 +122,12 @@ def pytest_addoption(parser: Parser) -> None:
) )
group._addoption( group._addoption(
"-c", "-c",
metavar="file", "--config-file",
metavar="FILE",
type=str, type=str,
dest="inifilename", dest="inifilename",
help="Load configuration from `file` instead of trying to locate one of the " help="Load configuration from `FILE` instead of trying to locate one of the "
"implicit configuration files", "implicit configuration files.",
) )
group._addoption( group._addoption(
"--continue-on-collection-errors", "--continue-on-collection-errors",

11
testing/test_config.py
View File

@ -514,6 +514,8 @@ class TestConfigCmdlineParsing:
) )
config = pytester.parseconfig("-c", "custom.ini") config = pytester.parseconfig("-c", "custom.ini")
assert config.getini("custom") == "1" assert config.getini("custom") == "1"
config = pytester.parseconfig("--config-file", "custom.ini")
assert config.getini("custom") == "1"
pytester.makefile( pytester.makefile(
".cfg", ".cfg",
@ -524,6 +526,8 @@ class TestConfigCmdlineParsing:
) )
config = pytester.parseconfig("-c", "custom_tool_pytest_section.cfg") config = pytester.parseconfig("-c", "custom_tool_pytest_section.cfg")
assert config.getini("custom") == "1" assert config.getini("custom") == "1"
config = pytester.parseconfig("--config-file", "custom_tool_pytest_section.cfg")
assert config.getini("custom") == "1"
pytester.makefile( pytester.makefile(
".toml", ".toml",
@ -536,6 +540,8 @@ class TestConfigCmdlineParsing:
) )
config = pytester.parseconfig("-c", "custom.toml") config = pytester.parseconfig("-c", "custom.toml")
assert config.getini("custom") == "1" assert config.getini("custom") == "1"
config = pytester.parseconfig("--config-file", "custom.toml")
assert config.getini("custom") == "1"
def test_absolute_win32_path(self, pytester: Pytester) -> None: def test_absolute_win32_path(self, pytester: Pytester) -> None:
temp_ini_file = pytester.makefile( temp_ini_file = pytester.makefile(
@ -550,6 +556,8 @@ class TestConfigCmdlineParsing:
temp_ini_file_norm = normpath(str(temp_ini_file)) temp_ini_file_norm = normpath(str(temp_ini_file))
ret = pytest.main(["-c", temp_ini_file_norm]) ret = pytest.main(["-c", temp_ini_file_norm])
assert ret == ExitCode.OK assert ret == ExitCode.OK
ret = pytest.main(["--config-file", temp_ini_file_norm])
assert ret == ExitCode.OK
class TestConfigAPI: class TestConfigAPI:
@ -1907,6 +1915,9 @@ class TestSetupCfg:
with pytest.raises(pytest.fail.Exception): with pytest.raises(pytest.fail.Exception):
pytester.runpytest("-c", "custom.cfg") pytester.runpytest("-c", "custom.cfg")
with pytest.raises(pytest.fail.Exception):
pytester.runpytest("--config-file", "custom.cfg")
class TestPytestPluginsVariable: class TestPytestPluginsVariable:
def test_pytest_plugins_in_non_top_level_conftest_unsupported( def test_pytest_plugins_in_non_top_level_conftest_unsupported(