Fix bug 1049: Raise exception if model does not exist when destroying a model

[osm/N2VC.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index b353ce8..4685666 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,3 +1,17 @@
+# Copyright 2019 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.
+
 # Tox (http://tox.testrun.org/) is a tool for running tests
 # in multiple virtualenvs. This configuration file will run the
 # test suite on all supported python versions. To use it, "pip install tox"
@@ -14,14 +28,19 @@ 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
+    VCA_CACERT
     # These are needed so executing `charm build` succeeds
     TERM
     TERMINFO
@@ -38,7 +57,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 -n auto -k 'not integration' -m 'not serial' {posargs}
 
 [testenv:lint]
 envdir = {toxworkdir}/py3
@@ -49,7 +68,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 =