x/tuskar-ui
Code Issues Proposed changes

Rename venvs to match everyone else.

Browse Source 
Change-Id: I22a3ecdc9ddf1ddd557b831e897684a56b2975f6
This commit is contained in:
Monty Taylor 2012-02-13 12:11:08 -08:00
parent 2e914f9578
commit 25cefd3f27
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
run_tests.sh
View File

@ -46,7 +46,7 @@ function usage {
# DEFAULTS FOR RUN_TESTS.SH # DEFAULTS FOR RUN_TESTS.SH
# #
root=`pwd` root=`pwd`
venv=$root/.horizon-venv venv=$root/.venv
with_venv=tools/with_venv.sh with_venv=tools/with_venv.sh
included_dirs="openstack-dashboard/dashboard horizon/horizon" included_dirs="openstack-dashboard/dashboard horizon/horizon"
@ -238,7 +238,7 @@ function restore_environment {
return 0 return 0
fi 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 cp -r /tmp/.horizon_environment/$JOB_NAME/.environment_version ./ || true
echo "Environment restored successfully." echo "Environment restored successfully."
@ -283,8 +283,8 @@ function run_tests {
if [ $with_coverage -eq 1 ]; then if [ $with_coverage -eq 1 ]; then
echo "Generating coverage reports" echo "Generating coverage reports"
${command_wrapper} coverage combine ${command_wrapper} coverage combine
${command_wrapper} coverage xml -i --omit='/usr*,setup.py,*egg*,.horizon-venv/*' ${command_wrapper} coverage xml -i --omit='/usr*,setup.py,*egg*,.venv/*'
${command_wrapper} coverage html -i --omit='/usr*,setup.py,*egg*,.horizon-venv/*' -d reports ${command_wrapper} coverage html -i --omit='/usr*,setup.py,*egg*,.venv/*' -d reports
fi fi
# Remove the leftover coverage files from the -p flag earlier. # Remove the leftover coverage files from the -p flag earlier.
rm -f .coverage.* rm -f .coverage.*

4
tools/install_venv.py
View File

@ -30,7 +30,7 @@ import sys
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) 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') WITH_VENV = os.path.join(ROOT, 'tools', 'with_venv.sh')
PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires') 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 To activate the virtualenv for the extent of your current shell session you
can run: can run:
$ source .horizon-venv/bin/activate $ source .venv/bin/activate
""" """
print summary print summary

2
tools/with_venv.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
TOOLS=`dirname $0` TOOLS=`dirname $0`
VENV=$TOOLS/../.horizon-venv VENV=$TOOLS/../.venv
source $VENV/bin/activate && $@ source $VENV/bin/activate && $@