merge with default

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 5345ce3..5dba0bc 100644
--- a/tox/config.py
+++ b/tox/config.py
@@ -381,6 +381,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