Merge "Remove installer type from tempest blacklist"

[functest.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 62785a1..44e81ab 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = docs,pep8,pylint,yamllint,bashate,py35,py27,perm,cover
 usedevelop = True
 deps =
   -c{toxinidir}/upper-constraints.txt
-  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens
+  -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,23 +52,22 @@ commands = flake8
 basepython = python2.7
 whitelist_externals = bash
 modules =
-  functest.api
   functest.ci
-  functest.cli
+  functest.opnfv_tests.openstack.cinder
   functest.opnfv_tests.openstack.rally
   functest.opnfv_tests.openstack.refstack
   functest.opnfv_tests.openstack.snaps
   functest.opnfv_tests.openstack.tempest
+  functest.opnfv_tests.openstack.vmtp
   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
   functest.tests.unit.openstack.tempest
+  functest.tests.unit.openstack.vmtp
   functest.tests.unit.openstack.vping
   functest.tests.unit.vnf.router
   functest.tests.unit.utils
@@ -78,8 +77,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,8 +89,8 @@ commands =
 basepython = python2.7
 files =
   .travis.yml
+  ci
   docker
-  functest/api
   functest/ci
   functest/opnfv_tests/vnf
 commands =
@@ -99,8 +99,9 @@ commands =
 [testenv:py35]
 dirs =
   functest/tests/unit/ci
-  functest/tests/unit/cli
   functest/tests/unit/odl
+  functest/tests/unit/openstack
+  functest/tests/unit/vnf/epc
   functest/tests/unit/utils
 commands = nosetests {[testenv:py35]dirs}
 
@@ -110,6 +111,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/convert_images.sh
   functest/ci/download_images.sh
   build.sh
 commands = bashate {[testenv:bashate]files}
@@ -119,9 +121,13 @@ basepython = python2.7
 dirs =
   functest/tests/unit/ci
   functest/tests/unit/odl
+  functest/tests/unit/openstack/vping
+  functest/tests/unit/openstack/cinder
 commands = nosetests --with-coverage --cover-tests \
   --cover-package functest.ci.check_deployment \
   --cover-package functest.opnfv_tests.sdn.odl \
+  --cover-package functest.opnfv_tests.openstack.vping.vping_ssh \
+  --cover-package functest.opnfv_tests.openstack.cinder.cinder_test \
   --cover-package functest.tests.unit \
   --cover-min-percentage 100 {[testenv:cover]dirs}