X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Funit.py;h=2ec1769560e538bce345d07fb42b7d9951f7a7a4;hb=db399019ac73dfb980d48b231d69a267de27dd87;hp=d0a70bd277b1e520c897bb82e32e0d5261d0f825;hpb=d613f8d8ae11dc96c240219884f44f2e3f9d004c;p=osm%2FN2VC.git

diff --git a/juju/unit.py b/juju/unit.py
index d0a70bd..2ec1769 100644
--- a/juju/unit.py
+++ b/juju/unit.py
@@ -161,9 +161,9 @@ class Unit(model.ModelEntity):
             raise Exception('Unknown action error: %s' % error.serialize())
         action_id = action.tag[len('action-'):]
         log.debug('Action started as %s', action_id)
-        # we can't use wait_for_new here because we don't
-        # consistently (ever?) get an "add" delta for the action
-        return await self.model._wait('action', action_id, None)
+        # we mustn't use wait_for_action because that blocks until the
+        # action is complete, rather than just being in the model
+        return await self.model._wait_for_new('action', action_id)
 
     def scp(
             self, source_path, user=None, destination_path=None, proxy=False,
@@ -227,5 +227,14 @@ class Unit(model.ModelEntity):
 
         status = await c.FullStatus(None)
 
-        return status.applications[app]['units'][self.name].get(
-            'leader', False)
+        try:
+            return status.applications[app]['units'][self.name].get(
+                'leader', False)
+        except KeyError:
+            # FullStatus may be more up-to-date than the model
+            # referenced by this class. If this unit has been
+            # destroyed between the time the class was created and the
+            # time that we call this method, we'll get a KeyError. In
+            # that case, we simply return False, as a destroyed unit
+            # is not a leader.
+            return False