From 7d3a0f367056d2f42a9977b9bf0e6e9c38c6fd60 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Tue, 4 Oct 2016 17:22:38 +0000
Subject: [PATCH] Fix to run functional tests

After the scenario test merge [1] our functional tests were no longer
being run by the py* tests.  This patch adds a functional test
environment and updates the cover environment to include the
functional test coverage.

[1] https://review.openstack.org/172199

Change-Id: If6b1de66ed441e0c05cc8daf640b6e713d7e0708
Closes-Bug: #1630012
---
 tox.ini | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index b9ade44a80..281adaa025 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = docs,py35,py34,py27,pep8,specs
+envlist = docs,py35,py34,py27,functional,pep8,specs
 skipsdist = True
 
 [testenv]
@@ -18,11 +18,25 @@ commands =
   python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:cover]
-commands = python setup.py testr --coverage --testr-args='{posargs}'
+whitelist_externals = sh
+commands =
+    sh -c 'COVERAGE_FILE={toxinidir}/.coverage-py27 python setup.py testr --coverage --testr-args='{posargs}''
+    sh -c 'COVERAGE_FILE={toxinidir}/.coverage-functional OS_TEST_PATH={toxinidir}/octavia/tests/functional python setup.py testr --coverage --testr-args='{posargs}''
+    sh -c 'ls -al'
+    coverage combine --debug=dataio {toxinidir}/.coverage-py27 {toxinidir}/.coverage-functional
+    coverage html -d cover
 
 [testenv:functional]
 setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
 
+[testenv:functional-py34]
+basepython = python3.4
+setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
+
+[testenv:functional-py35]
+basepython = python3.5
+setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
+
 [testenv:debug]
 commands = oslo_debug_helper {posargs}