From b3ac09e36410618457c3412b43dbe3f271483d15 Mon Sep 17 00:00:00 2001 From: Pete Vander Giessen Date: Tue, 22 Nov 2016 13:07:44 -0500 Subject: [PATCH] Added a catch for the case where we call is_leader_from_status on a destroyed unit. --- juju/unit.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/juju/unit.py b/juju/unit.py index d0a70bd..55a60fd 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 -- 2.25.1