summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2017-08-20 21:59:12 +0200
committerGauvain Pocentek <gauvain@pocentek.net>2017-08-20 21:59:12 +0200
commit311464b71c508503d5275db5975bc10ed74674bd (patch)
tree3cb7c476838cd9f3dd66eda77621f0d696b52ee1
parent5210956278e8d0bd4e5676fc116851626ac89491 (diff)
downloadgitlab-311464b71c508503d5275db5975bc10ed74674bd.tar.gz
update tox/travis for CLI v3/4 tests
-rw-r--r--.travis.yml3
-rw-r--r--tox.ini9
2 files changed, 8 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 365308f..fc3751e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,8 @@ env:
- TOX_ENV=docs
- TOX_ENV=py_func_v3
- TOX_ENV=py_func_v4
- - TOX_ENV=cli_func
+ - TOX_ENV=cli_func_v3
+ - TOX_ENV=cli_func_v4
install:
- pip install tox
script:
diff --git a/tox.ini b/tox.ini
index 5e97e9e..9898e9e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,11 +32,14 @@ commands = python setup.py build_sphinx
commands =
python setup.py testr --slowest --coverage --testr-args="{posargs}"
-[testenv:cli_func]
-commands = {toxinidir}/tools/functional_tests.sh
+[testenv:cli_func_v3]
+commands = {toxinidir}/tools/functional_tests.sh -a 3
+
+[testenv:cli_func_v4]
+commands = {toxinidir}/tools/functional_tests.sh -a 4
[testenv:py_func_v3]
-commands = {toxinidir}/tools/py_functional_tests.sh
+commands = {toxinidir}/tools/py_functional_tests.sh -a 3
[testenv:py_func_v4]
commands = {toxinidir}/tools/py_functional_tests.sh -a 4