check_format: check Python style with pep8

Also continue checking for errors after a problem has been found.

Change-Id: Iea37311e54f68fb6ba8c804ad4b2fb92d5238f36
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-10-18 09:56:25 -07:00
parent 823958551b
commit 38d41acda4
3 changed files with 37 additions and 9 deletions

View File

@ -6,6 +6,8 @@ cd $BASEDIR
# exit on errors # exit on errors
set -e set -e
rc=0
if hash astyle; then if hash astyle; then
echo -n "Checking coding style..." echo -n "Checking coding style..."
rm -f astyle.log rm -f astyle.log
@ -21,17 +23,43 @@ if hash astyle; then
echo "Incorrect code style detected in one or more files." echo "Incorrect code style detected in one or more files."
echo "The files have been automatically formatted." echo "The files have been automatically formatted."
echo "Remember to add the files to your commit." echo "Remember to add the files to your commit."
rm -f astyle.log rc=1
exit 1 else
fi
echo " OK" echo " OK"
fi
rm -f astyle.log rm -f astyle.log
else else
echo "You do not have astyle installed so your code style is not being checked!" echo "You do not have astyle installed so your code style is not being checked!"
exit 0
fi fi
git grep -I -l -e . -z | \ echo -n "Checking blank lines at end of file..."
xargs -0 -P8 -n1 scripts/eofnl
exit 0 if ! git grep -I -l -e . -z | \
xargs -0 -P8 -n1 scripts/eofnl > eofnl.log; then
echo " Incorrect end-of-file formatting detected"
cat eofnl.log
rc=1
else
echo " OK"
fi
rm -f eofnl.log
if hash pep8; then
echo -n "Checking Python style..."
PEP8_ARGS+=" --ignore=E302" # ignore 'E302 expected 2 blank lines, found 1'
PEP8_ARGS+=" --max-line-length=140"
error=0
git ls-files '*.py' | xargs -n1 pep8 $PEP8_ARGS > pep8.log || error=1
if [ $error -ne 0 ]; then
echo " Python formatting errors detected"
cat pep8.log
rc=1
else
echo " OK"
fi
rm -f pep8.log
fi
exit $rc

View File

@ -401,7 +401,7 @@ def verify_add_nvme_bdev_rpc_methods(rpc_py):
if out != '': if out != '':
ctrlr_address = "0000:{}".format(out.split(" ")[0]) ctrlr_address = "0000:{}".format(out.split(" ")[0])
output = rpc.construct_nvme_bdev(ctrlr_address) output = rpc.construct_nvme_bdev(ctrlr_address)
if output.strip()=='': if output.strip() == '':
print "add nvme device passed first time" print "add nvme device passed first time"
test_pass = 1 test_pass = 1
verify(test_pass == 1, 1, "add nvme device passed first time") verify(test_pass == 1, 1, "add nvme device passed first time")