diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-01 20:02:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-01 20:02:22 +0000 |
| commit | faab62d22b79554fe9b8557453622d96148ed364 (patch) | |
| tree | d49a00ad1621b56e2ba9b7866a37cb8bf27291fa | |
| parent | 4321c2a5c994c0bb5654b97c4fb09197f8b9fcfa (diff) | |
| parent | d95d6bfe756e28ba8ccb7f12ff5f403488c508b9 (diff) | |
Merge "ignore .tox directory for pep8 in runtests"
| -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 b32657a7..2fca39de 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -51,7 +51,7 @@ function process_option { -p|--pep8) just_pep8=1;; -P|--no-pep8) no_pep8=1;; -c|--coverage) coverage=1;; - -xintegration) nokeystoneclient=1;; + -xintegration) nokeystoneclient=1;; --standard-threads) export STANDARD_THREADS=1 ;; @@ -84,7 +84,7 @@ if [ $coverage -eq 1 ]; then fi if [ $nokeystoneclient -eq 1 ]; then - # disable the integration tests + # disable the integration tests noseopts="$noseopts -I test_keystoneclient*" fi @@ -109,7 +109,7 @@ function run_pep8 { # Opt-out files from pep8 ignore_scripts="*.pyc,*.pyo,*.sh,*.swp,*.rst" ignore_files="*pip-requires" - ignore_dirs=".venv,openstack,vendor" + ignore_dirs=".venv,openstack,vendor,.tox" ignore="$ignore_scripts,$ignore_files,$ignore_dirs" srcfiles="." # Just run PEP8 in current environment |