From: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Date: Tue, 22 Nov 2016 21:20:29 +0000 (-0500)
Subject: Merge pull request #16 from petevg/bug/keyerror-in-is-leader
X-Git-Tag: 0.1.0~39
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=db399019ac73dfb980d48b231d69a267de27dd87;hp=fada936cf549a9e346c6c2ce45d5cc5da7e6c0c7;p=osm%2FN2VC.git

Merge pull request #16 from petevg/bug/keyerror-in-is-leader

Added a catch for the case where we call is_leader_from_status on a destroyed unit.
---

diff --git a/juju/unit.py b/juju/unit.py
index 1f8254f..2ec1769 100644
--- a/juju/unit.py
+++ b/juju/unit.py
@@ -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