tox: enable bashate

Change-Id: I441ff386515a6f3616ee8b0f09bf073126ffa79d
This commit is contained in:
Isaku Yamahata
2017-06-07 18:16:48 -07:00
committed by Isaku Yamahata
parent 4084376091
commit 5c12b9da0f
10 changed files with 34 additions and 23 deletions

View File

@@ -39,8 +39,7 @@ source $NETWORKING_ODL_DIR/devstack/entry_points
# Restore xtrace # Restore xtrace
$_XTRACE_NETWORKING_ODL $_XTRACE_NETWORKING_ODL
if [[ "$ODL_USING_EXISTING_JAVA" == "True" ]] if [[ "$ODL_USING_EXISTING_JAVA" == "True" ]]; then
then
echo 'Using installed java.' echo 'Using installed java.'
java -version || exit 1 java -version || exit 1
fi fi

View File

@@ -26,8 +26,7 @@ function _odl_show_info {
sudo ip route sudo ip route
sudo ovsdb-client dump sudo ovsdb-client dump
sudo ovs-vsctl show sudo ovs-vsctl show
for br in $(sudo ovs-vsctl list-br) for br in $(sudo ovs-vsctl list-br); do
do
echo "--- flows on $br ---" echo "--- flows on $br ---"
sudo ovs-ofctl --protocols OpenFlow13 dump-ports $br sudo ovs-ofctl --protocols OpenFlow13 dump-ports $br
sudo ovs-ofctl --protocols OpenFlow13 dump-ports-desc $br sudo ovs-ofctl --protocols OpenFlow13 dump-ports-desc $br

View File

@@ -27,7 +27,7 @@ function setup_java {
return 0 return 0
} }
function setup_java_env() { function setup_java_env {
local JAVA_COMMAND="${1:-${JAVA:-java}}" local JAVA_COMMAND="${1:-${JAVA:-java}}"
JAVA_LINK="$(which $JAVA_COMMAND)" JAVA_LINK="$(which $JAVA_COMMAND)"

View File

@@ -16,6 +16,7 @@ testresources>=0.2.4 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD
WebTest>=2.0 # MIT WebTest>=2.0 # MIT
testtools>=1.4.0 # MIT testtools>=1.4.0 # MIT
bashate>=0.2 # Apache-2.0
# releasenotes # releasenotes
reno!=2.3.1,>=1.8.0 # Apache-2.0 reno!=2.3.1,>=1.8.0 # Apache-2.0

12
tox.ini
View File

@@ -59,6 +59,7 @@ commands =
doc8 doc/source devstack releasenotes/source rally-jobs doc8 doc/source devstack releasenotes/source rally-jobs
neutron-db-manage --subproject networking-odl check_migration neutron-db-manage --subproject networking-odl check_migration
{[testenv:genconfig]commands} {[testenv:genconfig]commands}
{[testenv:bashate]commands}
whitelist_externals = mkdir whitelist_externals = mkdir
[testenv:i18n] [testenv:i18n]
@@ -97,6 +98,17 @@ show-source = True
ignore = N530 ignore = N530
exclude=./.*,dist,doc,releasenotes,*lib/python*,*egg,build,tools exclude=./.*,dist,doc,releasenotes,*lib/python*,*egg,build,tools
[testenv:bashate]
commands = bash -c "find {toxinidir} \
-not \( -type d -name .\* -prune \) \
-type f \
-name \*.sh \
# E005 file does not begin with #! or have a .sh prefix
# E006 check for lines longer than 79 columns
# E042 local declaration hides errors
# E043 Arithmetic compound has inconsistent return semantics
-print0 | xargs -0 bashate -v -iE006 -eE005,E042,E043"
[testenv:genconfig] [testenv:genconfig]
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
commands = commands =