Merge "Split glanceclient functional tests"

1 files changed, 14 insertions, 1 deletions

diff --git a/tox.ini b/tox.ini
index dd82c7c..98cfae3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,7 +30,20 @@ warnerror = True
 # See glanceclient/tests/functional/README.rst
 # for information on running the functional tests.
 setenv =
-  OS_TEST_PATH = ./glanceclient/tests/functional
+  OS_TEST_PATH = ./glanceclient/tests/functional/v2
+  OS_TESTENV_NAME = {envname}
+whitelist_externals =
+    bash
+commands =
+    bash tools/fix_ca_bundle.sh
+    python setup.py testr --testr-args='{posargs}'
+
+[testenv:functional-v1]
+# TODO(rosmaita): remove this testenv at the beginning
+# of the 'S' cycle
+setenv =
+  OS_TEST_PATH = ./glanceclient/tests/functional/v1
+  OS_TESTENV_NAME = {envname}
 whitelist_externals =
     bash
 commands =