From 3c7438969aa81300b264bbe6ffce6be271e0ecce Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 23 Jul 2019 06:46:56 +0200 Subject: [PATCH] Replace internal config._origargs with invocation_params.args Added in https://github.com/pytest-dev/pytest/pull/5564. --- src/_pytest/config/__init__.py | 6 +++--- src/_pytest/helpconfig.py | 2 +- testing/test_config.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py index cb9a72d0e..dbcc4cc67 100644 --- a/src/_pytest/config/__init__.py +++ b/src/_pytest/config/__init__.py @@ -632,10 +632,10 @@ class Config: Object containing the parameters regarding the ``pytest.main`` invocation. - Contains the followinig read-only attributes: + Contains the following read-only attributes: * ``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. """ @@ -915,7 +915,7 @@ class Config: assert not hasattr( self, "args" ), "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( kwargs=dict(pluginmanager=self.pluginmanager) ) diff --git a/src/_pytest/helpconfig.py b/src/_pytest/helpconfig.py index b379fae01..50acc2d7d 100644 --- a/src/_pytest/helpconfig.py +++ b/src/_pytest/helpconfig.py @@ -98,7 +98,7 @@ def pytest_cmdline_parse(): py.__version__, ".".join(map(str, sys.version_info)), os.getcwd(), - config._origargs, + config.invocation_params.args, ) ) config.trace.root.setwriter(debugfile.write) diff --git a/testing/test_config.py b/testing/test_config.py index bda89834b..143cb90d1 100644 --- a/testing/test_config.py +++ b/testing/test_config.py @@ -441,7 +441,7 @@ class TestConfigFromdictargs: assert config.option.capture == "no" 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""" from _pytest.config import Config @@ -450,7 +450,7 @@ class TestConfigFromdictargs: config = Config.fromdictargs(option_dict, args) assert config.args == ["a", "b"] - assert config._origargs == args + assert config.invocation_params.args == args assert config.option.verbose == 4 assert config.option.capture == "no"