Merge pull request #5644 from blueyed/rm-_orig_args

Replace internal config._origargs with invocation_params.args
This commit is contained in:
Bruno Oliveira 2019-07-23 11:03:52 -03:00 committed by GitHub
commit 4abf95ba4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -632,10 +632,10 @@ class Config:
Object containing the parameters regarding the ``pytest.main`` Object containing the parameters regarding the ``pytest.main``
invocation. invocation.
Contains the followinig read-only attributes: Contains the following read-only attributes:
* ``args``: list of command-line arguments as passed to ``pytest.main()``. * ``args``: list of command-line arguments as passed to ``pytest.main()``.
* ``plugins``: list of extra plugins, might be None * ``plugins``: list of extra plugins, might be None.
* ``dir``: directory where ``pytest.main()`` was invoked from. * ``dir``: directory where ``pytest.main()`` was invoked from.
""" """
@ -915,7 +915,7 @@ class Config:
assert not hasattr( assert not hasattr(
self, "args" self, "args"
), "can only parse cmdline args at most once per Config object" ), "can only parse cmdline args at most once per Config object"
self._origargs = args assert self.invocation_params.args == args
self.hook.pytest_addhooks.call_historic( self.hook.pytest_addhooks.call_historic(
kwargs=dict(pluginmanager=self.pluginmanager) kwargs=dict(pluginmanager=self.pluginmanager)
) )

View File

@ -98,7 +98,7 @@ def pytest_cmdline_parse():
py.__version__, py.__version__,
".".join(map(str, sys.version_info)), ".".join(map(str, sys.version_info)),
os.getcwd(), os.getcwd(),
config._origargs, config.invocation_params.args,
) )
) )
config.trace.root.setwriter(debugfile.write) config.trace.root.setwriter(debugfile.write)

View File

@ -441,7 +441,7 @@ class TestConfigFromdictargs:
assert config.option.capture == "no" assert config.option.capture == "no"
assert config.args == args assert config.args == args
def test_origargs(self, _sys_snapshot): def test_invocation_params_args(self, _sys_snapshot):
"""Show that fromdictargs can handle args in their "orig" format""" """Show that fromdictargs can handle args in their "orig" format"""
from _pytest.config import Config from _pytest.config import Config
@ -450,7 +450,7 @@ class TestConfigFromdictargs:
config = Config.fromdictargs(option_dict, args) config = Config.fromdictargs(option_dict, args)
assert config.args == ["a", "b"] assert config.args == ["a", "b"]
assert config._origargs == args assert config.invocation_params.args == args
assert config.option.verbose == 4 assert config.option.verbose == 4
assert config.option.capture == "no" assert config.option.capture == "no"