From: Eric Harney <eharney@redhat.com>
Date: Fri, 22 Nov 2013 15:13:58 +0000 (-0500)
Subject: Fix ./run_tests.sh -V --virtual-env-name
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d79ea38c168230377828bc5667e4fdbd8638b776;p=openstack-build%2Fcinder-build.git

Fix ./run_tests.sh -V --virtual-env-name

Currently if --virtual-env-name is specified, the tests fail
because it still creates .venv/ but then looks in the specified
location to use the venv.

This makes --virtual-env-name work as expected.

Change-Id: I036cd08f7b7b9dc87e7012f8dd198a26375297a2
---

diff --git a/tools/install_venv.py b/tools/install_venv.py
index 772cac96d..9d76055cb 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -56,6 +56,8 @@ def print_help():
 def main(argv):
     root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
     venv = os.path.join(root, '.venv')
+    if os.environ.get('venv'):
+        venv = os.environ['venv']
     pip_requires = os.path.join(root, 'requirements.txt')
     test_requires = os.path.join(root, 'test-requirements.txt')
     project = 'Cinder'