From 4eda45e66bae205bedc9cb8edb0d9ffac6549b8e Mon Sep 17 00:00:00 2001 From: Oliver Bestwalter Date: Wed, 5 Jun 2019 14:55:09 +0200 Subject: [PATCH] envconfig.missing_subs is not a setting: should be a private attribute --- src/tox/config/__init__.py | 4 ++-- src/tox/venv.py | 4 ++-- tests/unit/config/test_config.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py index 2ef07a463..19820d033 100644 --- a/src/tox/config/__init__.py +++ b/src/tox/config/__init__.py @@ -883,7 +883,7 @@ def __init__(self, envname, config, factors, reader): #: set of factors self.factors = factors self._reader = reader - self.missing_subs = [] + self._missing_subs = [] """Holds substitutions that could not be resolved. Pre 2.8.1 missing substitutions crashed with a ConfigError although this would not be a @@ -1233,7 +1233,7 @@ def make_envconfig(self, name, section, subs, config, replace=True): if env_attr.postprocess: res = env_attr.postprocess(testenv_config=tc, value=res) except tox.exception.MissingSubstitution as e: - tc.missing_subs.append(e.name) + tc._missing_subs.append(e.name) res = e.FLAG setattr(tc, env_attr.name, res) if atype in ("path", "string", "basepython"): diff --git a/src/tox/venv.py b/src/tox/venv.py index 9d0c8a5ab..72b0b737f 100644 --- a/src/tox/venv.py +++ b/src/tox/venv.py @@ -575,11 +575,11 @@ def _pcall( ) def setupenv(self): - if self.envconfig.missing_subs: + if self.envconfig._missing_subs: self.status = ( "unresolvable substitution(s): {}. " "Environment variables are missing or defined recursively.".format( - ",".join(["'{}'".format(m) for m in self.envconfig.missing_subs]) + ",".join(["'{}'".format(m) for m in self.envconfig._missing_subs]) ) ) return diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py index b814b7a6e..7c1fa6045 100644 --- a/tests/unit/config/test_config.py +++ b/tests/unit/config/test_config.py @@ -556,7 +556,7 @@ def test_missing_env_sub_raises_config_error_in_non_testenv(self, newconfig): def test_missing_env_sub_populates_missing_subs(self, newconfig): config = newconfig("[testenv:foo]\ncommands={env:VAR}") print(SectionReader("section", config._cfg).getstring("commands")) - assert config.envconfigs["foo"].missing_subs == ["VAR"] + assert config.envconfigs["foo"]._missing_subs == ["VAR"] def test_getstring_environment_substitution_with_default(self, monkeypatch, newconfig): monkeypatch.setenv("KEY1", "hello")