summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorNejc Habjan <nejc.habjan@siemens.com>2020-09-05 00:15:04 +0200
committerNejc Habjan <nejc.habjan@siemens.com>2020-09-15 22:05:48 +0200
commit79489c775141c4ddd1f7aecae90dae8061d541fe (patch)
tree7c8f45e232049e0cad13af57e05b7ccbd8c6bb82 /tox.ini
parent0d89a6e61bd4ae244c1545463272ef830d72dda9 (diff)
downloadgitlab-79489c775141c4ddd1f7aecae90dae8061d541fe.tar.gz
test(env): replace custom scripts with pytest and docker-compose
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini6
1 files changed, 4 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index df7ca09..92196e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -55,7 +55,9 @@ commands =
omit = *tests*
[testenv:cli_func_v4]
-commands = {toxinidir}/tools/functional_tests.sh -a 4
+deps = -r{toxinidir}/docker-requirements.txt
+commands = pytest --script-launch-mode=subprocess tools/functional/cli {posargs}
[testenv:py_func_v4]
-commands = {toxinidir}/tools/py_functional_tests.sh -a 4
+deps = -r{toxinidir}/docker-requirements.txt
+commands = pytest tools/functional/api {posargs}