Fix bug 733

[osm/N2VC.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index a568d3f..481bb9d 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -14,14 +14,18 @@ markers =
 [testenv]
 basepython=python3
 usedevelop=True
+
 # for testing with other python versions
-commands = py.test --ignore modules/ --tb native -ra -v -s -n auto -k 'not integration' -m 'not serial' {posargs}
+commands = py.test --ignore modules/ --ignore tests/charms/ --tb native -ra -v -s -n auto -k 'not integration' -m 'not serial' {posargs}
 passenv =
     HOME
+    VCA_PATH
     VCA_HOST
     VCA_PORT
     VCA_USER
     VCA_SECRET
+    LXD_HOST
+    LXD_SECRET
     # These are needed so executing `charm build` succeeds
     TERM
     TERMINFO
@@ -31,13 +35,14 @@ deps =
     pytest
     pytest-asyncio
     pytest-xdist
+    pytest-assume
     paramiko
     pylxd
 
 [testenv:py3]
 # default tox env, excludes integration and serial tests
 commands =
-    pytest --ignore modules/ --tb native -ra -v -s -n auto -k 'not integration' -m 'not serial' {posargs}
+    pytest --ignore modules/ --ignore tests/charms/ --tb native -ra -v -s -n auto -k 'not integration' -m 'not serial' {posargs}
 
 [testenv:lint]
 envdir = {toxworkdir}/py3
@@ -48,7 +53,7 @@ deps =
 
 [testenv:integration]
 envdir = {toxworkdir}/py3
-commands = py.test --ignore modules/ --tb native -ra -v -s -n 1 -k 'integration' -m 'serial' {posargs}
+commands = py.test --ignore modules/  --ignore tests/charms/ --tb native -ra -v -s -n 1 -k 'integration' -m 'serial' {posargs}
 
 [testenv:build]
 deps =