X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=8a2bfd7cd80c3ddec6cdcb3cc58ae01405465549;hb=c717c43b1257e126296a4b1d697c8f6a72728855;hp=aa3087ae2355d431722c493dcc005f941140f3e0;hpb=8ff4c9da8e0835cfa2c14edfa2ad8f3d53cbb725;p=functest.git

diff --git a/tox.ini b/tox.ini
index aa3087ae2..8a2bfd7cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,11 @@
 [tox]
-envlist = docs,pep8,pylint,yamllint,py35,py27,perm,cover
+envlist = docs,pep8,pylint,yamllint,bashate,py35,py27,perm,cover
 
 [testenv]
 usedevelop = True
 deps =
   -c{toxinidir}/upper-constraints.txt
-  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}
@@ -52,18 +52,16 @@ commands = flake8
 basepython = python2.7
 whitelist_externals = bash
 modules =
-  functest.api
   functest.ci
-  functest.cli
   functest.opnfv_tests.openstack.rally
   functest.opnfv_tests.openstack.refstack
   functest.opnfv_tests.openstack.snaps
   functest.opnfv_tests.openstack.tempest
   functest.opnfv_tests.openstack.vping
+  functest.opnfv_tests.openstack.cinder
   functest.opnfv_tests.sdn.odl
   functest.opnfv_tests.vnf.router
   functest.tests.unit.ci
-  functest.tests.unit.cli
   functest.tests.unit.odl
   functest.tests.unit.openstack.rally
   functest.tests.unit.openstack.snaps
@@ -77,8 +75,9 @@ modules =
   functest.utils.functest_utils
 commands =
   bash -c "\
-    pylint -f parseable --ignore-imports=y --disable=locally-disabled functest | \
-    tee pylint.out | sed -ne '/Raw metrics/,//p'"
+    pylint -f parseable \
+        --ignore-imports=y \
+        --disable=locally-disabled functest | tee pylint.out"
   pylint --reports=n --errors-only functest
   pylint --disable=locally-disabled \
     --disable=duplicate-code \
@@ -89,7 +88,6 @@ basepython = python2.7
 files =
   .travis.yml
   docker
-  functest/api
   functest/ci
   functest/opnfv_tests/vnf
 commands =
@@ -98,11 +96,23 @@ commands =
 [testenv:py35]
 dirs =
   functest/tests/unit/ci
-  functest/tests/unit/cli
+  functest/tests/unit/core
   functest/tests/unit/odl
+  functest/tests/unit/openstack
+  functest/tests/unit/vnf/epc
   functest/tests/unit/utils
 commands = nosetests {[testenv:py35]dirs}
 
+[testenv:bashate]
+basepython = python2.7
+files =
+  functest/opnfv_tests/openstack/cinder/write_data.sh
+  functest/opnfv_tests/openstack/cinder/read_data.sh
+  functest/opnfv_tests/openstack/rally/scenario/support/instance_dd_test.sh
+  functest/ci/download_images.sh
+  build.sh
+commands = bashate {[testenv:bashate]files}
+
 [testenv:cover]
 basepython = python2.7
 dirs =