X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=2b3e07ea936c9dc4340cff158bdd4c578d2e0c32;hb=refs%2Fchanges%2F99%2F63099%2F1;hp=46782995f14934555bf52872bdddeab1564abcd4;hpb=4300f0c67b9cb5b75911b0764175044f5e8d3a32;p=functest.git

diff --git a/tox.ini b/tox.ini
index 46782995f..2b3e07ea9 100644
--- 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
-  -c{env:UPPER_CONSTRAINTS_FILE:https://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=master}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}
@@ -15,6 +15,7 @@ commands = nosetests --with-xunit \
   --cover-package=functest \
   --cover-xml \
   --cover-html \
+  --with-html-output \
   functest/tests/unit
 
 [testenv:docs]
@@ -53,12 +54,13 @@ basepython = python2.7
 whitelist_externals = bash
 modules =
   functest.ci
+  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
@@ -66,6 +68,7 @@ modules =
   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
@@ -87,8 +90,10 @@ commands =
 basepython = python2.7
 files =
   .travis.yml
+  ci
   docker
   functest/ci
+  functest/opnfv_tests/openstack/rally/rally_jobs.yaml
   functest/opnfv_tests/vnf
 commands =
   yamllint -s {[testenv:yamllint]files}
@@ -96,7 +101,6 @@ commands =
 [testenv:py35]
 dirs =
   functest/tests/unit/ci
-  functest/tests/unit/core
   functest/tests/unit/odl
   functest/tests/unit/openstack
   functest/tests/unit/vnf/epc
@@ -108,7 +112,8 @@ 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/add_proxy.sh
+  functest/ci/convert_images.sh
   functest/ci/download_images.sh
   build.sh
 commands = bashate {[testenv:bashate]files}
@@ -119,10 +124,12 @@ 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}