From 407c3f79cd066e485cd667ad511a4f0137bde1ec Mon Sep 17 00:00:00 2001
From: Roman Prykhodchenko <me@romcheg.me>
Date: Tue, 22 Dec 2015 10:42:25 +0100
Subject: [PATCH] Revert "Don't set environment variables in tox.ini"

This reverts commit 3e7738fd3fb18a2d5f53b1ecc9706dc53b65a511 and a minor
temporary change in base functional test made in
07e5fb8cbed222252caa74b32953fa162053ac9d.

Since tox-2.3.1 was released, all the abovementioned changes are not
needed anymore.

Closes-bug: #1528494
Change-Id: I23d3cd4c7fa31e58a4f173a1cc15c4b54f794f43
---
 fuelclient/tests/functional/base.py |  3 +--
 tools/cleanup.sh                    |  2 +-
 tools/prepare_nailgun.sh            |  1 -
 tox.ini                             | 34 ++++++++++++-----------------
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/fuelclient/tests/functional/base.py b/fuelclient/tests/functional/base.py
index 378f840..349652c 100644
--- a/fuelclient/tests/functional/base.py
+++ b/fuelclient/tests/functional/base.py
@@ -45,8 +45,7 @@ class CliExectutionResult(object):
 
 
 class BaseTestCase(oslo_base.BaseTestCase):
-    nailgun_root = os.path.join(os.getenv('FUEL_WEB_ROOT', '/tmp/fuel_web/'),
-                                'nailgun')
+    nailgun_root = os.environ.get('NAILGUN_ROOT', '/tmp/fuel_web/nailgun')
 
     def setUp(self):
         super(BaseTestCase, self).setUp()
diff --git a/tools/cleanup.sh b/tools/cleanup.sh
index 222cff2..97e09b0 100644
--- a/tools/cleanup.sh
+++ b/tools/cleanup.sh
@@ -17,7 +17,7 @@
 set -eu
 
 NAILGUN_CONFIG=$ARTIFACTS/test.yaml
-NAILGUN_ROOT=$FUEL_WEB_ROOT/nailgun
+
 
 # Sends SIGING to the running instance of Nailgun, if it exists
 kill_server() {
diff --git a/tools/prepare_nailgun.sh b/tools/prepare_nailgun.sh
index 8561917..e9ff4f2 100644
--- a/tools/prepare_nailgun.sh
+++ b/tools/prepare_nailgun.sh
@@ -17,7 +17,6 @@
 set -eu
 
 NAILGUN_CONFIG=$ARTIFACTS/test.yaml
-NAILGUN_ROOT=$FUEL_WEB_ROOT/nailgun
 
 err() {
     printf "%s\n" "$1" >&2
diff --git a/tox.ini b/tox.ini
index 2dde22c..da7ecb5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,30 +10,24 @@ whitelist_externals = bash
                       oslo_debug_helper
                       python
 setenv = VIRTUAL_ENV={envdir}
-         ARTIFACTS={toxinidir}/test_run
-         FUELCLIENT_JUNIT=fuelclient-{envname}.xml
-         FUELCLIENT_CUSTOM_SETTINGS={toxinidir}/test_run/fuel_client_config.yaml
+         ARTIFACTS={toxinidir}/{env:ARTIFACTS:test_run}
+         FUELCLIENT_JUNIT={env:FUELCLIENT_JUNIT:fuelclient}-{envname}.xml
+         FUELCLIENT_CUSTOM_SETTINGS={toxinidir}/{env:ARTIFACTS:test_run}/fuel_client_config.yaml
 
          # Functional env settings
-         FUEL_WEB_CLONE=yes
-         FUEL_WEB_REPO=https://github.com/stackforge/fuel-web.git
-         FETCH_REPO=
-         FETCH_REFSPEC=
-         FUEL_COMMIT=master
-         NAILGUN_ROOT=/tmp/fuel_web/nailgun
+         FUEL_WEB_CLONE={env:FUEL_WEB_CLONE:yes}
+         FUEL_WEB_REPO={env:FUEL_WEB_REPO:https://github.com/stackforge/fuel-web.git}
+         FUEL_WEB_ROOT={env:FUEL_WEB_ROOT:/tmp/fuel_web}
+         FETCH_REPO={env:FETCH_REPO:}
+         FETCH_REFSPEC={env:FETCH_REFSPEC:}
+         FUEL_COMMIT={env:FUEL_COMMIT:master}
+         NAILGUN_ROOT={env:FUEL_WEB_ROOT:/tmp/fuel_web}/nailgun
 
          # Nailgun server parameters
-         NAILGUN_PORT=8003
-         NAILGUN_CHECK_PATH=/api/version
-         NAILGUN_START_MAX_WAIT_TIME=20
-
-# NOTE(romcheg): this is a temporary change to work around
-#                a bug in tox 2.2.1
-#                Don't forget to set up all these variables,
-#                manually if you're trying to run tests on
-#                your local environment.
-passenv = FUEL_WEB_ROOT TEST_NAILGUN_DB
-
+         NAILGUN_PORT={env:NAILGUN_PORT:8003}
+         NAILGUN_CHECK_PATH={env:NAILGUN_CHECK_PATH:/api/version}
+         NAILGUN_START_MAX_WAIT_TIME={env:NAILGUN_START_MAX_WAIT_TIME:20}
+         TEST_NAILGUN_DB={env:TEST_NAILGUN_DB:nailgun}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt