Merge pull request #466 from ehildenb/test-validator-script

Test validator script

1 files changed, 10 insertions, 15 deletions

diff --git a/.travis.yml b/.travis.yml
index a8cc9bd7a..cd8731f94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,20 @@
 language: python
 python: 
-  - "2.7"
-node_js: 
-  - "8"
+  - "3.6"
 branches:
   only:
     - master
     - develop
 sudo: false
-install: "npm install jsonschema json-dup-key-validator"
+install: "pip install jsonschema pysha3"
 script:
-# won't fail, but print problems
-- find . -name 'node_modules' -prune -o \( -name "*.json" -not -name "*Filler.json" -exec echo {} \; -exec python -mjson.tool {} /dev/null \; 2>&1 \) | grep -v -B 1 "^\./" | cat
-# will fail, if linting fails
-- find . -name 'node_modules' -prune -o \( -name "*.json" -not -name "*Filler.json" -print0 \) | xargs -I file -n1 -0 python -mjson.tool file /dev/null
 
-# run schema tests against GeneralStateTests
-- echo "Linting state tests"
-- echo -e "$(find GeneralStateTests -name '*.json')" | node JSONSchema/validate.js JSONSchema/st-schema.json
-- echo -e "$(find src/GeneralStateTestsFiller -name '*.json')" | node JSONSchema/validate.js JSONSchema/st-filler-schema.json
+# check valid JSON/well formatted
+- python3 test.py format ;
+  git diff --quiet &>/dev/null ;
 
-# run schema tests against BlockchainTests
-- echo "Linting blockchain tests"
-- echo -e "$(find BlockchainTests -name '*.json')" | node JSONSchema/validate.js JSONSchema/bc-schema.json
+# check test schemas
+  python3 test.py validate ./src/VMTestsFiller ./src/GeneralStateTestsFiller ./src/BlockchainTestsFiller ./VMTests ./GeneralStateTests ./BlockchainTests ;
+
+# check test filled
+  python3 test.py checkFilled ./BlockhcainTests ./GeneralStateTests ./TransactionTests ./VMTests