summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Dague <sdague@linux.vnet.ibm.com>2013-01-08 17:09:07 -0500
committerSean Dague <sdague@linux.vnet.ibm.com>2013-01-10 08:57:49 -0500
commitedca0c2a3d5282ba3d8b1ebe2d138ed8e84a9853 (patch)
treef589af59049fcdbb084c9c8ee93372ac372ff9b4
parent5fca1d9e97913af549adaef0827b189540fc87fa (diff)
downloadnova-edca0c2a3d5282ba3d8b1ebe2d138ed8e84a9853.tar.gz
nova-edca0c2a3d5282ba3d8b1ebe2d138ed8e84a9853.tar.xz
nova-edca0c2a3d5282ba3d8b1ebe2d138ed8e84a9853.zip
make runtests -p act more like tox
now that all the N402 fixes are in, start enforcing it Change-Id: I9d495849bf698e5af142d0ccafe551ac0e8a600c
-rwxr-xr-xrun_tests.sh14
-rw-r--r--tox.ini4
2 files changed, 12 insertions, 6 deletions
diff --git a/run_tests.sh b/run_tests.sh
index c4a1d9efc..a79c8564c 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}
}
diff --git a/tox.ini b/tox.ini
index ca5e6e778..1c43be4ed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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]