diff options
| author | Justin Shepherd <jshepher@rackspace.com> | 2011-11-02 14:02:09 -0500 |
|---|---|---|
| committer | Justin Shepherd <jshepher@rackspace.com> | 2011-11-02 14:02:09 -0500 |
| commit | 700e2db3f9c5fb882c10e48738dda3cd6a0dde2e (patch) | |
| tree | 543bd372545a0359071b93c66ba7e64b533aa326 | |
| parent | bbf4540268657d04d470352081476727ffde464c (diff) | |
| download | keystone-700e2db3f9c5fb882c10e48738dda3cd6a0dde2e.tar.gz keystone-700e2db3f9c5fb882c10e48738dda3cd6a0dde2e.tar.xz keystone-700e2db3f9c5fb882c10e48738dda3cd6a0dde2e.zip | |
Set run_tests.sh so pep8 runs in the virtualenv.
fixes bug 885380
Change-Id: I95af25bd230452c1e4d30ebcd29ef98d211f6824
| -rwxr-xr-x | run_tests.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/run_tests.sh b/run_tests.sh index aee3f055..447e3f28 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -27,7 +27,7 @@ function process_option { -h|--help) usage;; -V|--virtual-env) let always_venv=1; let never_venv=0;; -N|--no-virtual-env) let always_venv=0; let never_venv=1;; - -p|--pep8) let just_pep8=1; let never_venv=1;; + -p|--pep8) let just_pep8=1;; -l|--pylint) let just_pylint=1; let never_venv=0;; -f|--force) let force=1;; --unittests-only) noseargs="$noseargs --exclude-dir=keystone/tests/functional --exclude-dir=keystone/tests/system";; @@ -59,7 +59,7 @@ function run_pep8 { PEP8_EXCLUDE="vcsversion.py" PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat --show-pep8 --show-source" PEP8_INCLUDE="bin/k* keystone examples tools setup.py run_tests.py" - pep8 $PEP8_OPTIONS $PEP8_INCLUDE + ${wrapper} pep8 $PEP8_OPTIONS $PEP8_INCLUDE } function run_pylint { @@ -94,7 +94,7 @@ then if [ "x$use_ve" = "xY" -o "x$use_ve" = "x" -o "x$use_ve" = "xy" ]; then # Install the virtualenv and run the test suite in it python tools/install_venv.py - wrapper=${with_venv} + wrapper=${with_venv} fi fi fi |