x
/
gantt
Code Issues Proposed changes

Merge "make runtests -p act more like tox"

This commit is contained in:
Jenkins 2013-01-10 19:22:29 +00:00 committed by Gerrit Code Review
parent e66fb4a143 781d943ced
commit a680fec067
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
run_tests.sh
View File

@ -116,18 +116,24 @@ function run_pep8 {
srcfiles=`find nova -type f -name "*.py" ! -wholename "nova\/openstack*"` srcfiles=`find nova -type f -name "*.py" ! -wholename "nova\/openstack*"`
srcfiles+=" `find bin -type f ! -name "nova.conf*" ! -name "*api-paste.ini*"`" srcfiles+=" `find bin -type f ! -name "nova.conf*" ! -name "*api-paste.ini*"`"
srcfiles+=" `find tools -type f -name "*.py"`" srcfiles+=" `find tools -type f -name "*.py"`"
srcfiles+=" `find plugins -type f -name "*.py"`"
srcfiles+=" `find smoketests -type f -name "*.py"`"
srcfiles+=" setup.py" srcfiles+=" setup.py"
# Until all these issues get fixed, ignore. # 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} ${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 # NOTE(sirp): Dom0 plugins are written for Python 2.4, meaning some HACKING
# checks are too strict. # checks are too strict.
pep8onlyfiles=`find plugins -type f -name "*.py"` # pep8onlyfiles=`find plugins -type f -name "*.py"`
pep8onlyfiles+=" `find plugins/xenserver/xenapi/etc/xapi.d/plugins/ -type f -perm +111`" # pep8onlyfiles+=" `find plugins/xenserver/xenapi/etc/xapi.d/plugins/ -type f -perm +111`"
${wrapper} pep8 ${ignore} ${pep8onlyfiles} # ${wrapper} pep8 ${ignore} ${pep8onlyfiles}
} }

4
tox.ini
View File

@ -18,9 +18,9 @@ downloadcache = ~/cache/pip
[testenv:pep8] [testenv:pep8]
deps=pep8==1.3.3 deps=pep8==1.3.3
commands = 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 . --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 --filename=nova* bin
[testenv:pylint] [testenv:pylint]