From 1c5da2e89c06ba21aea87dcf4d57356ddec137b6 Mon Sep 17 00:00:00 2001
From: yatin karel <yatin.karel@nectechnologies.in>
Date: Sat, 27 Aug 2016 19:52:02 +0530
Subject: [PATCH] Import environment variables from testenv

Imported test environment settings to all the test suites
from testenv.

Change-Id: I65c7ece6afa3729faddf6255d6ecda2d14ce67b4
Closes-Bug: #1617571
---
 tox.ini | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index 8a45fa4189..a164d51124 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,8 @@ commands = oslo_debug_helper {posargs}
 
 [testenv:functional-api]
 sitepackages = True
-setenv = OS_TEST_PATH=./magnum/tests/functional/api
+setenv = {[testenv]setenv}
+         OS_TEST_PATH=./magnum/tests/functional/api
          OS_TEST_TIMEOUT=7200
 deps =
   {[testenv]deps}
@@ -38,7 +39,8 @@ commands =
 
 [testenv:functional-k8s]
 sitepackages = True
-setenv = OS_TEST_PATH=./magnum/tests/functional/k8s
+setenv = {[testenv]setenv}
+         OS_TEST_PATH=./magnum/tests/functional/k8s
          OS_TEST_TIMEOUT=7200
 deps =
   {[testenv]deps}
@@ -48,7 +50,8 @@ commands =
 
 [testenv:functional-k8s-ironic]
 sitepackages = True
-setenv = OS_TEST_PATH=./magnum/tests/functional/k8s_ironic
+setenv = {[testenv]setenv}
+         OS_TEST_PATH=./magnum/tests/functional/k8s_ironic
          OS_TEST_TIMEOUT=7200
 deps =
   {[testenv]deps}
@@ -58,7 +61,8 @@ commands =
 
 [testenv:functional-k8s-coreos]
 sitepackages = True
-setenv = OS_TEST_PATH=./magnum/tests/functional/k8s_coreos
+setenv = {[testenv]setenv}
+         OS_TEST_PATH=./magnum/tests/functional/k8s_coreos
          OS_TEST_TIMEOUT=7200
 deps =
   {[testenv]deps}
@@ -68,7 +72,8 @@ commands =
 
 [testenv:functional-swarm]
 sitepackages = True
-setenv = OS_TEST_PATH=./magnum/tests/functional/swarm
+setenv = {[testenv]setenv}
+         OS_TEST_PATH=./magnum/tests/functional/swarm
          OS_TEST_TIMEOUT=7200
 deps =
   {[testenv]deps}
@@ -78,7 +83,8 @@ commands =
 
 [testenv:functional-mesos]
 sitepackages = True
-setenv = OS_TEST_PATH=./magnum/tests/functional/mesos
+setenv = {[testenv]setenv}
+         OS_TEST_PATH=./magnum/tests/functional/mesos
          OS_TEST_TIMEOUT=7200
 deps =
   {[testenv]deps}