Fix tox4 error when passenv value

tox4 fails when pass_env contain whitespace to separate multiple values.

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Iebba85f27f76bcb8e04ce0fce685a4add8028d00

diff --git a/tox.ini b/tox.ini
index 0c433b53239cd6a3f7357d614092b1e40435bedf..9a396a1e15ea34305fc75d4e062b22beec6ce558 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,16 @@ skipsdist = true
 setupdir = tests/
 
 [testenv]
-passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OLM_TIMER1 OLM_TIMER2
+passenv =
+    USE_LIGHTY
+    http_proxy
+    HTTP_PROXY
+    https_proxy
+    HTTPS_PROXY
+    no_proxy
+    NO_PROXY
+    OLM_TIMER1
+    OLM_TIMER2
 setenv =
     USE_LIGHTY=True
     OLM_TIMER1=3000
@@ -67,7 +76,10 @@ deps =
   setuptools>=7.0
   gnpy4tpce==2.4.7
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY, USE_ODL_RESTCONF_VERSION
+passenv =
+    LAUNCHER
+    USE_LIGHTY
+    USE_ODL_RESTCONF_VERSION
 basepython = python3
 commands =
   ./launch_tests.sh pce {posargs:}
@@ -76,7 +88,9 @@ commands =
 depends = buildcontroller
 # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY
+passenv =
+    LAUNCHER
+    USE_LIGHTY
 setenv =
     USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
@@ -88,7 +102,10 @@ commands =
 depends = buildcontroller,build_karaf_tests121,sims121,testsPCE
 # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+passenv =
+    LAUNCHER
+    USE_LIGHTY
+    USE_ODL_RESTCONF_VERSION
 setenv =
     USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
@@ -109,7 +126,9 @@ commands =
 depends = buildcontroller
 # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY
+passenv =
+    LAUNCHER
+    USE_LIGHTY
 setenv =
     USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
@@ -121,7 +140,10 @@ commands =
 depends = buildcontroller,build_karaf_tests221,sims221,tests71
 # tests71 dependency is only here to chain tests in the gate and avoid ressources starvation
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+passenv =
+    LAUNCHER
+    USE_LIGHTY
+    USE_ODL_RESTCONF_VERSION
 setenv =
     USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
@@ -134,7 +156,9 @@ commands =
 depends = buildcontroller
 # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY
+passenv =
+    LAUNCHER
+    USE_LIGHTY
 setenv =
     USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
@@ -145,7 +169,10 @@ commands =
 [testenv:tests71]
 depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+passenv =
+    LAUNCHER
+    USE_LIGHTY
+    USE_ODL_RESTCONF_VERSION
 setenv =
     USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
@@ -157,7 +184,9 @@ commands =
 [testenv:build_karaf_tests_hybrid]
 depends = buildcontroller
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER, USE_LIGHTY
+passenv =
+    LAUNCHER
+    USE_LIGHTY
 setenv =
     USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
@@ -169,7 +198,10 @@ commands =
 depends = buildcontroller,build_karaf_tests_hybrid,sims121,sims221,sims71,tests121,tests221,tests71
 #the last dependency is to avoid temporarily concurrent ressources problem in parallel mode
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+passenv =
+    LAUNCHER
+    USE_LIGHTY
+    USE_ODL_RESTCONF_VERSION
 setenv =
     USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
@@ -182,7 +214,12 @@ commands =
 [testenv:tests_tapi]
 depends = buildcontroller,build_karaf_tests221,sims221
 allowlist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY OLM_TIMER1 OLM_TIMER2 USE_ODL_RESTCONF_VERSION
+passenv =
+    LAUNCHER
+    USE_LIGHTY
+    OLM_TIMER1
+    OLM_TIMER2
+    USE_ODL_RESTCONF_VERSION
 setenv =
     USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
@@ -199,7 +236,12 @@ commands =
 depends = buildcontroller,sims221
 allowlist_externals = launch_tests.sh
                       dockercmd.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION OLM_TIMER1 OLM_TIMER2
+passenv =
+    LAUNCHER
+    USE_LIGHTY
+    USE_ODL_RESTCONF_VERSION
+    OLM_TIMER1
+    OLM_TIMER2
 setenv =
     OLM_TIMER1=3000
     OLM_TIMER2=2000
@@ -213,14 +255,26 @@ commands =
   ./dockercmd.sh container rm -f tpce_kafka1
 
 [testenv:docs]
-passenv = http_proxy, HTTP_PROXY, https_proxy, HTTPS_PROXY, no_proxy, NO_PROXY
+passenv =
+    http_proxy
+    HTTP_PROXY
+    https_proxy
+    HTTPS_PROXY
+    no_proxy
+    NO_PROXY
 basepython = python3
 deps = -rdocs/requirements.txt
 commands =
     sphinx-build -q -W --keep-going -b html -n -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/html
 
 [testenv:docs-linkcheck]
-passenv = http_proxy, HTTP_PROXY, https_proxy, HTTPS_PROXY, no_proxy, NO_PROXY
+passenv =
+    http_proxy
+    HTTP_PROXY
+    https_proxy
+    HTTPS_PROXY
+    no_proxy
+    NO_PROXY
 basepython = python3
 deps = -rdocs/requirements.txt
 commands = sphinx-build -q -b linkcheck -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/linkcheck