summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-08 20:12:07 +0000
committerGerrit Code Review <review@openstack.org>2016-08-08 20:12:07 +0000
commit6cb8f9d518f6df70885ce9c95b1464f576577276 (patch)
treec6df6c17fddddd972132bc4df65fccd4693db607
parentf7798166280a631e34e56e93e7a3515fc91dfb7a (diff)
parent9281f08b3e89759bc28977cb894da3712be3e3b4 (diff)
Merge "Make units and linters run in tox by default"
-rw-r--r--tox.ini7
1 files changed, 3 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 984cbd7..3aeb0d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
1[tox] 1[tox]
2minversion = 1.6 2minversion = 1.6
3skipsdist = True 3skipsdist = True
4envlist = py27 4envlist = units, linters
5skip_missing_interpreters = True 5skip_missing_interpreters = True
6 6
7[testenv] 7[testenv]
@@ -33,8 +33,8 @@ deps=
33commands = python -m unittest tests.test_cicd_apps.MuranoCiCdTest.test_deploy_cicd 33commands = python -m unittest tests.test_cicd_apps.MuranoCiCdTest.test_deploy_cicd
34 34
35[testenv:units] 35[testenv:units]
36# FIXME! 36commands =
37commands = python -m unittest unittests.test_namespaces.TestNamespaces.test_namespaces 37 python -m unittest discover unittests --pattern=*.py
38 38
39[testenv:bindep] 39[testenv:bindep]
40# Do not install any requirements. We want this to be fast and work even if 40# Do not install any requirements. We want this to be fast and work even if
@@ -71,4 +71,3 @@ whitelist_externals = shellcheck
71commands = 71commands =
72 {toxinidir}/tools/jenkins/shellcheck.sh {toxinidir} 72 {toxinidir}/tools/jenkins/shellcheck.sh {toxinidir}
73 {toxinidir}/tools/jenkins/yamllint.sh {toxinidir} 73 {toxinidir}/tools/jenkins/yamllint.sh {toxinidir}
74