From f20b1d4240095c58a80843006f32a4ebe45636bf Mon Sep 17 00:00:00 2001
From: Maru Newby <marun@redhat.com>
Date: Tue, 14 Jan 2014 18:43:22 +0000
Subject: [PATCH] Add an explicit tox job for functional tests

This change is in support of adding a new jenkins job dedicated
to functional testing.  Functional tests will no longer be
run as part of the unit tests.

Change-Id: Ia99940f7e5a2165720ae2a74aadf62ff17ad3d75
---
 .testr.conf | 2 +-
 tox.ini     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.testr.conf b/.testr.conf
index b63d965523..c180b0319f 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ neutron/tests $LISTOPT $IDOPTION
+test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./neutron/tests/unit} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/tox.ini b/tox.ini
index 22eed4b4ad..69a4d70057 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,11 @@ deps = -r{toxinidir}/requirements.txt
 commands =
   python -m neutron.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
 
+[testenv:functional]
+setenv = OS_TEST_PATH=./neutron/tests/functional
+commands =
+  python setup.py testr --slowest --testr-args='{posargs}'
+
 [tox:jenkins]
 sitepackages = True
 downloadcache = ~/cache/pip