Reintroduce 'DeadEntityException' allowance (#74)

* Reintroduce 'DeadEntityException' allowance when tearing down machines which may already be gone from libjuju model

* bump to next predictable version

* fixed issue with argument name

Author: Adam Dyess

pytest_operator/plugin.py

@@ -41,6 +41,8 @@
 from _pytest.config import Config
 from _pytest.config.argparsing import Parser
 from juju.client.jujudata import FileJujuData
+from juju.exceptions import DeadEntityException
+from juju.errors import JujuError
 from juju.model import Model, Controller, websockets
 
 log = logging.getLogger(__name__)
@@ -822,14 +824,22 @@ async def forget_model(
     @staticmethod
     async def _reset(model: Model, allow_failure, timeout: Optional[int] = None):
         # Forcibly destroy applications/machines in case any units are in error.
-        log.info(f"Resetting model {model.info.name}...")
-        for app in model.applications.values():
-            log.info(f"   Destroying application {app.name}")
-            await app.destroy()
+        async def _destroy(entity_name: str, **kwargs):
+            for key, entity in getattr(model, entity_name).items():
+                try:
+                    log.info(f"   Destroying {entity_name} {key}")
+                    await entity.destroy(**kwargs)
+                except DeadEntityException as e:
+                    log.warning(e)
+                    log.warning(f"{entity_name.title()} already dead, skipping")
+                except JujuError as e:
+                    log.exception(e)
+                    if not allow_failure:
+                        raise
 
-        for machine in model.machines.values():
-            log.info(f"  Destroying machine {machine.id}")
-            await machine.destroy(force=True)
+        log.info(f"Resetting model {model.info.name}...")
+        await _destroy("applications")
+        await _destroy("machines", force=True)
 
         if timeout is None:
             log.info("Not waiting on reset to complete.")

setup.py

@@ -24,7 +24,7 @@
     name="pytest-operator",
     packages=find_packages(include=["pytest_operator"]),
     url="https://github.com/charmed-kubernetes/pytest-operator",
-    version="0.18.0",
+    version="0.19.0",
     zip_safe=True,
     install_requires=[
         "ipdb",

tox.ini

@@ -40,7 +40,10 @@ commands = pytest \
 
 [testenv:integration]
 passenv = HOME
-commands = pytest --tb=native --show-capture=no --log-cli-level=INFO -vs --ignore=tests/data --model-config tests/data/model-config.yaml {posargs:tests/integration}
+commands =
+    pytest --tb=native --show-capture=no --log-cli-level=INFO\
+           -vs --ignore=tests/data --ignore=tests/unit \
+           --model-config tests/data/model-config.yaml {posargs:tests/integration}
 deps =
     juju
      -e {toxinidir}