diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-10 19:22:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-10 19:22:29 +0000 |
| commit | 7529e513e2f71e6e054639aa3475ff21934625d4 (patch) | |
| tree | dd6423b1f8a199e36f3c936607cfa1ab6570fd34 | |
| parent | fdecf760d50c3497810c8f827fd74d9af518e762 (diff) | |
| parent | edca0c2a3d5282ba3d8b1ebe2d138ed8e84a9853 (diff) | |
Merge "make runtests -p act more like tox"
| -rwxr-xr-x | run_tests.sh | 14 | ||||
| -rw-r--r-- | tox.ini | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/run_tests.sh b/run_tests.sh index 89d26abe8..1a54c1bef 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -116,18 +116,24 @@ function run_pep8 { srcfiles=`find nova -type f -name "*.py" ! -wholename "nova\/openstack*"` srcfiles+=" `find bin -type f ! -name "nova.conf*" ! -name "*api-paste.ini*"`" srcfiles+=" `find tools -type f -name "*.py"`" + srcfiles+=" `find plugins -type f -name "*.py"`" + srcfiles+=" `find smoketests -type f -name "*.py"`" srcfiles+=" setup.py" # Until all these issues get fixed, ignore. - ignore='--ignore=N402,E12,E711,E721,E712' + ignore='--ignore=E12,E711,E721,E712' ${wrapper} python tools/hacking.py ${ignore} ${srcfiles} + # NOTE(sdague): as of grizzly-2 these are passing however leaving the comment + # in here in case we need to break it out when we get more of our hacking working + # again. + # # NOTE(sirp): Dom0 plugins are written for Python 2.4, meaning some HACKING # checks are too strict. - pep8onlyfiles=`find plugins -type f -name "*.py"` - pep8onlyfiles+=" `find plugins/xenserver/xenapi/etc/xapi.d/plugins/ -type f -perm +111`" - ${wrapper} pep8 ${ignore} ${pep8onlyfiles} + # pep8onlyfiles=`find plugins -type f -name "*.py"` + # pep8onlyfiles+=" `find plugins/xenserver/xenapi/etc/xapi.d/plugins/ -type f -perm +111`" + # ${wrapper} pep8 ${ignore} ${pep8onlyfiles} } @@ -18,9 +18,9 @@ downloadcache = ~/cache/pip [testenv:pep8] deps=pep8==1.3.3 commands = - python tools/hacking.py --ignore=N402,E12,E711,E721,E712 --repeat --show-source \ + python tools/hacking.py --ignore=E12,E711,E721,E712 --repeat --show-source \ --exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg . - python tools/hacking.py --ignore=N402,E12,E711,E721,E712 --repeat --show-source \ + python tools/hacking.py --ignore=E12,E711,E721,E712 --repeat --show-source \ --filename=nova* bin [testenv:pylint] |