Merge branch 'master' into local-resources

Author: johnsca

juju/unit.py

@@ -125,7 +125,7 @@ async def resolved(self, retry=False):
         return await app_facade.ResolveUnitErrors(
             all_=False,
             retry=retry,
-            tags={'tag': [self.tag]})
+            tags={'entities': [{'tag': self.tag}]})
 
     async def run(self, command, timeout=None):
         """Run command on this unit.

tests/charm/dispatch

@@ -1,3 +1,13 @@
 #!/bin/bash
 
-status-set "$(config-get status)"
+status="$(config-get status)"
+
+if [[ "$status" == "error" ]]; then
+    if [[ -e .errored ]]; then
+        status="active"
+    else
+        touch .errored
+        exit 1
+    fi
+fi
+status-set "$status"

tests/integration/charm.charm

@@ -0,0 +1,4 @@
+options:
+  status:
+    type: string
+    default: "active"

tests/integration/charm/config.yaml

@@ -1,3 +1,13 @@
 #!/bin/bash
 
-status-set active
+status="$(config-get status)"
+
+if [[ "$status" == "error" ]]; then
+    if [[ -e .errored ]]; then
+        status="active"
+    else
+        touch .errored
+        exit 1
+    fi
+fi
+status-set "$status"

tests/integration/charm/dispatch

@@ -1,4 +1,5 @@
 import asyncio
+from pathlib import Path
 from tempfile import NamedTemporaryFile
 
 import pytest
@@ -144,16 +145,23 @@ async def test_ssh(event_loop):
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_resolve(event_loop):
+    charm_file = Path(__file__).absolute().parent / 'charm.charm'
 
     async with base.CleanModel() as model:
         app = await model.deploy(
-            'ubuntu-0',
-            application_name='ubuntu',
-            series='trusty',
-            channel='stable',
+            str(charm_file),
+            config={'status': 'error'},
         )
 
-        # Resolving a hook not in an error state is not a great test but at
-        # least it exercises the code.
-        for unit in app.units:
-            await unit.resolved()
+        try:
+            await model.wait_for_idle(raise_on_error=False)
+            assert app.units[0].workload_status == 'error'
+
+            await app.units[0].resolved()
+
+            await model.wait_for_idle(raise_on_error=False)
+            assert app.units[0].workload_status == 'active'
+        finally:
+            # Errored units won't get cleaned up unless we force them.
+            await asyncio.gather(*(machine.destroy(force=True)
+                                   for machine in model.machines.values()))