Bug 666: Fix window_size overflow with Paramiko

[osm/N2VC.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index b353ce8..c54d27d 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ markers =
 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_HOST
@@ -38,7 +38,7 @@ deps =
 [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
@@ -49,7 +49,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 =