X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tox.ini;h=3b15855a59e048638a87c0399628bafdc32c2ccb;hb=d2401bc3d6b3366951faacfd9984d37ee73d126b;hp=2c30e73b2452f8796e2c4a19ba445098c858105f;hpb=7d4f37c45d50c56dfe438c04dbecea3ca9f7c9d2;p=optf%2Fosdf.git

diff --git a/tox.ini b/tox.ini
index 2c30e73..3b15855 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 
 [tox]
 skipsdist=True
-envlist = py3, pylint
+envlist = py3, pylint, flake8diff
 
 [testenv]
 distribute = False
@@ -9,21 +9,40 @@ basepython=python3
 setenv   =
     OSDF_CONFIG_FILE={toxinidir}/test/config/osdf_config.yaml
 commands =
+    /bin/cp config/slicing_config.yaml test/config/
+    /bin/cp config/slicing_config.yaml test/functest/simulators/simulated-config/
     /bin/bash test/functest/scripts/start-simulators.sh
     coverage run --module pytest --junitxml xunit-results.xml
     coverage xml --omit=".tox/py3/*","test/*"
     coverage report -m --omit=".tox/py3/*","test/*"
     /bin/bash test/functest/scripts/stop-simulators.sh
+    /bin/rm test/config/slicing_config.yaml
+    /bin/rm test/functest/simulators/simulated-config/slicing_config.yaml
     # TODO: need to update the above "omit" when we package osdf as pip-installable
 deps = -r{toxinidir}/requirements.txt
     -r{toxinidir}/test/test-requirements.txt
+    -r{toxinidir}/requirements-osdf.txt
+    -r{toxinidir}/requirements-opteng.txt
 
 [run]
-source=./apps/,./osdf/,osdfapp.py
+source=./apps/,./osdf/,osdfapp.py,./runtime/,solverapp.py
 
 [testenv:pylint]
 whitelist_externals=bash
-commands = bash -c "pylint --reports=y osdf apps| tee pylint.out"
+commands = bash -c "pylint --reports=y osdf apps runtime| tee pylint.out"
 
 [testenv:py3]
 basepython=python3.6
+
+[testenv:flake8diff]
+basepython=python3.6
+whitelist_externals=bash
+deps = hacking>=2.0.0
+commands =
+  bash -c "files=$(git diff HEAD^ HEAD --diff-filter=d --name-only | grep -E '(^apps\/|osdf\/|runtime\/)'| grep -E '*\.py$'); if [[ -z $files ]]; then exit 0; else flake8 $files; fi"
+
+[flake8]
+select = E,H,W,F
+max-line-length = 119
+ignore = W503   #conflict with W504
+per-file-ignores=