From 25cefd3f27c9e02a1a1ad1936563938b26a0ffd6 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 13 Feb 2012 12:11:08 -0800
Subject: [PATCH] Rename venvs to match everyone else.

Change-Id: I22a3ecdc9ddf1ddd557b831e897684a56b2975f6
---
 run_tests.sh          | 8 ++++----
 tools/install_venv.py | 4 ++--
 tools/with_venv.sh    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index ec548c32c..bdf775fdd 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -46,7 +46,7 @@ function usage {
 # DEFAULTS FOR RUN_TESTS.SH
 #
 root=`pwd`
-venv=$root/.horizon-venv
+venv=$root/.venv
 with_venv=tools/with_venv.sh
 included_dirs="openstack-dashboard/dashboard horizon/horizon"
 
@@ -238,7 +238,7 @@ function restore_environment {
       return 0
     fi
 
-    cp -r /tmp/.horizon_environment/$JOB_NAME/.horizon-venv ./ || true
+    cp -r /tmp/.horizon_environment/$JOB_NAME/.venv ./ || true
     cp -r /tmp/.horizon_environment/$JOB_NAME/.environment_version ./ || true
 
     echo "Environment restored successfully."
@@ -283,8 +283,8 @@ function run_tests {
   if [ $with_coverage -eq 1 ]; then
     echo "Generating coverage reports"
     ${command_wrapper} coverage combine
-    ${command_wrapper} coverage xml -i --omit='/usr*,setup.py,*egg*,.horizon-venv/*'
-    ${command_wrapper} coverage html -i --omit='/usr*,setup.py,*egg*,.horizon-venv/*' -d reports
+    ${command_wrapper} coverage xml -i --omit='/usr*,setup.py,*egg*,.venv/*'
+    ${command_wrapper} coverage html -i --omit='/usr*,setup.py,*egg*,.venv/*' -d reports
   fi
   # Remove the leftover coverage files from the -p flag earlier.
   rm -f .coverage.*
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 9b8c8774c..480a570be 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -30,7 +30,7 @@ import sys
 
 
 ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-VENV = os.path.join(ROOT, '.horizon-venv')
+VENV = os.path.join(ROOT, '.venv')
 WITH_VENV = os.path.join(ROOT, 'tools', 'with_venv.sh')
 PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
 
@@ -132,7 +132,7 @@ def print_summary():
  To activate the virtualenv for the extent of your current shell session you
  can run:
 
- $ source .horizon-venv/bin/activate
+ $ source .venv/bin/activate
   """
     print summary
 
diff --git a/tools/with_venv.sh b/tools/with_venv.sh
index 59d915f91..c8d2940fc 100755
--- a/tools/with_venv.sh
+++ b/tools/with_venv.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 TOOLS=`dirname $0`
-VENV=$TOOLS/../.horizon-venv
+VENV=$TOOLS/../.venv
 source $VENV/bin/activate && $@