From e137fb2b2336f6c9f20e4789527b82cd89e502b2 Mon Sep 17 00:00:00 2001 From: mazzucco Date: Thu, 18 Jun 2015 10:50:48 +0100 Subject: hpk42/tox/issue/259/passenv-statement-should-accept-multi-line --- tests/test_config.py | 34 ++++++++++++++++++++++++++++++++-- tox/config.py | 5 +++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/tests/test_config.py b/tests/test_config.py index 4522f87..f85b563 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -696,14 +696,44 @@ class TestConfigTestEnv: assert envconfig.setenv['ANOTHER_VAL'] == 'else' @pytest.mark.parametrize("plat", ["win32", "linux2"]) - def test_passenv(self, tmpdir, newconfig, monkeypatch, plat): + def test_passenv_as_multiline_list(self, tmpdir, newconfig, monkeypatch, plat): monkeypatch.setattr(sys, "platform", plat) monkeypatch.setenv("A123A", "a") monkeypatch.setenv("A123B", "b") monkeypatch.setenv("BX23", "0") config = newconfig(""" [testenv] - passenv = A123* B?23 + passenv = + A123* + # isolated comment + B?23 + """) + assert len(config.envconfigs) == 1 + envconfig = config.envconfigs['python'] + if plat == "win32": + assert "PATHEXT" in envconfig.passenv + assert "SYSTEMDRIVE" in envconfig.passenv + assert "SYSTEMROOT" in envconfig.passenv + assert "TEMP" in envconfig.passenv + assert "TMP" in envconfig.passenv + else: + assert "TMPDIR" in envconfig.passenv + assert "PATH" in envconfig.passenv + assert "PIP_INDEX_URL" in envconfig.passenv + assert "LANG" in envconfig.passenv + assert "A123A" in envconfig.passenv + assert "A123B" in envconfig.passenv + + @pytest.mark.parametrize("plat", ["win32", "linux2"]) + def test_passenv_as_space_separated_list(self, tmpdir, newconfig, monkeypatch, plat): + monkeypatch.setattr(sys, "platform", plat) + monkeypatch.setenv("A123A", "a") + monkeypatch.setenv("A123B", "b") + monkeypatch.setenv("BX23", "0") + config = newconfig(""" + [testenv] + passenv = + A123* B?23 """) assert len(config.envconfigs) == 1 envconfig = config.envconfigs['python'] diff --git a/tox/config.py b/tox/config.py index 52e0dbc..75b9679 100644 --- a/tox/config.py +++ b/tox/config.py @@ -387,6 +387,11 @@ def tox_addoption(parser): help="list of X=Y lines with environment variable settings") def passenv(testenv_config, value): + if len(value) == 1 and "\n" in value[0]: + # If we have a list of 1 element that contains new lines, + # passenv has been specified as a multi line list. + value = value[0].split("\n") + passenv = set(["PATH", "PIP_INDEX_URL", "LANG"]) # we ensure that tmp directory settings are passed on -- cgit v1.2.1 From c779525b35d991ffd0c81e3023e7462c00558a49 Mon Sep 17 00:00:00 2001 From: Stefano Mazzucco Date: Thu, 18 Jun 2015 22:56:38 +0100 Subject: make passenv attribute type line-list --- tests/test_config.py | 24 ++++++++++++++++++++++-- tox/config.py | 10 +++++----- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/tests/test_config.py b/tests/test_config.py index f85b563..fae1bde 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -733,6 +733,7 @@ class TestConfigTestEnv: config = newconfig(""" [testenv] passenv = + # comment A123* B?23 """) assert len(config.envconfigs) == 1 @@ -754,20 +755,39 @@ class TestConfigTestEnv: def test_passenv_with_factor(self, tmpdir, newconfig, monkeypatch): monkeypatch.setenv("A123A", "a") monkeypatch.setenv("A123B", "b") + monkeypatch.setenv("A123C", "c") + monkeypatch.setenv("A123D", "d") monkeypatch.setenv("BX23", "0") + monkeypatch.setenv("CCA43", "3") + monkeypatch.setenv("CB21", "4") config = newconfig(""" [tox] envlist = {x1,x2} [testenv] passenv = - x1: A123A - x2: A123B + x1: A123A CC* + x1: CB21 + # passed to both environments + A123C + x2: A123B A123D """) assert len(config.envconfigs) == 2 + assert "A123A" in config.envconfigs["x1"].passenv + assert "A123C" in config.envconfigs["x1"].passenv + assert "CCA43" in config.envconfigs["x1"].passenv + assert "CB21" in config.envconfigs["x1"].passenv assert "A123B" not in config.envconfigs["x1"].passenv + assert "A123D" not in config.envconfigs["x1"].passenv + assert "BX23" not in config.envconfigs["x1"].passenv + assert "A123B" in config.envconfigs["x2"].passenv + assert "A123D" in config.envconfigs["x2"].passenv assert "A123A" not in config.envconfigs["x2"].passenv + assert "A123C" in config.envconfigs["x2"].passenv + assert "CCA43" not in config.envconfigs["x2"].passenv + assert "CB21" not in config.envconfigs["x2"].passenv + assert "BX23" not in config.envconfigs["x2"].passenv def test_changedir_override(self, tmpdir, newconfig): config = newconfig(""" diff --git a/tox/config.py b/tox/config.py index 5dba0bc..062992e 100644 --- a/tox/config.py +++ b/tox/config.py @@ -381,10 +381,10 @@ def tox_addoption(parser): help="list of X=Y lines with environment variable settings") def passenv(testenv_config, value): - if len(value) == 1 and "\n" in value[0]: - # If we have a list of 1 element that contains new lines, - # passenv has been specified as a multi line list. - value = value[0].split("\n") + # Flatten the list to deal with space-separated values. + value = list( + itertools.chain.from_iterable( + [x.split(' ') for x in value])) passenv = set(["PATH", "PIP_INDEX_URL", "LANG"]) @@ -407,7 +407,7 @@ def tox_addoption(parser): return passenv parser.add_testenv_attribute( - name="passenv", type="space-separated-list", postprocess=passenv, + name="passenv", type="line-list", postprocess=passenv, help="environment variables needed during executing test commands " "(taken from invocation environment). Note that tox always " "passes through some basic environment variables which are " -- cgit v1.2.1