summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-06-07 16:08:25 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-06-07 16:08:25 -0400
commitd4742cf8505ff86a4732f8d198fe6cedf260898e (patch)
tree72b5dc10770c7db0b6f811015061440916875419
parent3aad6758c0acc9b05f6f895fb814cced9580b758 (diff)
downloadnova-d4742cf8505ff86a4732f8d198fe6cedf260898e.tar.gz
nova-d4742cf8505ff86a4732f8d198fe6cedf260898e.tar.xz
nova-d4742cf8505ff86a4732f8d198fe6cedf260898e.zip
Added virtual environment to PEP8 tests
-rwxr-xr-xrun_tests.sh14
1 files changed, 8 insertions, 6 deletions
diff --git a/run_tests.sh b/run_tests.sh
index 9aa555484..c7bcd5d67 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -67,14 +67,11 @@ function run_pep8 {
srcfiles=`find bin -type f ! -name "nova.conf*"`
srcfiles+=" `find tools/*`"
srcfiles+=" nova setup.py plugins/xenserver/xenapi/etc/xapi.d/plugins/glance"
- pep8 --repeat --show-pep8 --show-source --exclude=vcsversion.py ${srcfiles}
+ # Just run PEP8 in current environment
+ ${wrapper} pep8 --repeat --show-pep8 --show-source \
+ --exclude=vcsversion.py ${srcfiles}
}
-if [ $just_pep8 -eq 1 ]; then
- run_pep8
- exit
-fi
-
NOSETESTS="python run_tests.py $noseargs"
if [ $never_venv -eq 0 ]
@@ -103,6 +100,11 @@ then
fi
fi
+if [ $just_pep8 -eq 1 ]; then
+ run_pep8
+ exit
+fi
+
run_tests || exit
# Also run pep8 if no options were provided.