X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tox.ini;h=8dc20c9a25280f0aec561c01c1476f842c05d4f8;hb=HEAD;hp=4723f466d34e62e60f6a6c147298f138d6d9f609;hpb=34ba229b31758c38a299a163de0007848b5921be;p=optf%2Fosdf.git

diff --git a/tox.ini b/tox.ini
index 4723f46..0bd2d9e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,29 +1,47 @@
 
 [tox]
 skipsdist=True
-envlist = py3, pylint
+envlist = py3, pylint, flake8diff
 
 [testenv]
+allowlist_externals=/bin/cp, /bin/bash, /bin/rm
 distribute = False
+basepython=python3
 setenv   =
     OSDF_CONFIG_FILE={toxinidir}/test/config/osdf_config.yaml
 commands =
-    - cat /etc/hosts
+    /bin/cp config/slicing_config.yaml test/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
     # 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=./osdf/,osdfapp.py
+source=./apps/,./osdf/,osdfapp.py,./runtime/,solverapp.py
 
 [testenv:pylint]
-whitelist_externals=bash
-commands = bash -c "pylint --reports=y osdf | tee pylint.out"
+allowlist_externals=bash
+commands = bash -c "pylint --reports=y osdf apps runtime| tee pylint.out"
 
 [testenv:py3]
-basepython=python3.6
+basepython=python3
+
+[testenv:flake8diff]
+basepython=python3
+allowlist_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= apps/pci/optimizers/__init__.py:F401