summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@redhat.com>2014-10-14 12:41:29 -0400
committerLars Kellogg-Stedman <lars@redhat.com>2014-10-14 22:36:43 -0400
commit8b4f8d91ad4aac047a11838a4fa11c51fd693fdc (patch)
treed4427396ce7d2d0162a0cd474abaaf28b9e9c558
parent63888e738546bfd93f8dd97a6ff11c612876426a (diff)
downloadkolla-8b4f8d91ad4aac047a11838a4fa11c51fd693fdc.tar.gz
kolla-8b4f8d91ad4aac047a11838a4fa11c51fd693fdc.zip
modify tox config to use new validation code
this patch modifies tox.ini to perform both the JSON and YAML validation checks. Change-Id: Ie8db699f19dc7698407bab1e3d51dcb6184cfad2
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini3
2 files changed, 3 insertions, 2 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index df7e22df3..5500f007d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1 @@
-demjson
+PyYAML
diff --git a/tox.ini b/tox.ini
index 53c0c830e..286a71767 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,4 +8,5 @@ deps = -r{toxinidir}/test-requirements.txt
[testenv:pep8]
commands =
- {toxinidir}/tools/validate-json.sh
+ {toxinidir}/tools/validate-all-json.sh
+ {toxinidir}/tools/validate-all-yaml.sh