summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml5
-rw-r--r--tox.ini8
2 files changed, 5 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 03c34bd94..087105cde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,9 @@ addons:
before_script:
- sudo apt-get -y install qemu-user-static
+ - sudo add-apt-repository -y ppa:jonathonf/python-3.6
+ - sudo apt-get update
+ - sudo apt-get install python3.6 python3.6-dev
- sudo pip install tox
- sudo -E docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}"
- (cd .. && git clone https://github.com/estesp/manifest-tool)
@@ -19,7 +22,7 @@ before_script:
jobs:
include:
- stage: run unit tests
- script: tox -e docs,pep8,pylint,yamllint,bashate,py27,cover
+ script: tox -e docs,pep8,pylint,yamllint,bashate,py27,py36,cover
- stage: build functest-core images
script: sudo -E bash build.sh
env:
diff --git a/tox.ini b/tox.ini
index 45f04e1b6..fac1d7094 100644
--- a/tox.ini
+++ b/tox.ini
@@ -88,13 +88,7 @@ commands =
ansible-lint ansible/site.yml
[testenv:py36]
-dirs =
- functest/tests/unit/ci
- functest/tests/unit/odl
- functest/tests/unit/openstack
- functest/tests/unit/vnf/epc
- functest/tests/unit/utils
-commands = nosetests {[testenv:py36]dirs}
+commands = nosetests functest/tests/unit
[testenv:bashate]
basepython = python2.7