commit e423a47b95f8f3a8fa1d8b39820741f059e4aa46
author June Tate-Gans <jtgans@google.com> Mon Apr 01 13:36:00 2019 -0700
committer June Tate-Gans <jtgans@google.com> Mon Apr 01 13:36:00 2019 -0700
tree d5efeb28778a2bfb2c903582caa73a8107d34191
parent 2b52903e887fa821e06ac7c1e29938d298716153

discoverer: Check to make sure info is real before using

This fixes a related issue in discovery when a removal occurs before the
announcement is complete.

Change-Id: I1c2dc2c4bfd29ef9e7a7225c39b0377f5d43d691

mdt/discoverer.py

diff --git a/mdt/discoverer.py b/mdt/discoverer.py
index 46ce367..bbe31a5 100644
--- a/mdt/discoverer.py
+++ b/mdt/discoverer.py
@@ -70,11 +70,12 @@
 
     def remove_service(self, zeroconf, type, name):
         info = self.zeroconf.get_service_info(type, name)
-        self._heard_announcement = True
 
-        if self.listener and hasattr(self.listener, "remove_device"):
-            self.listener.remove_device(info.server,
-                                        self.discoveries[info.server])
+        if info:
+            if self.listener and hasattr(self.listener, "remove_device"):
+                self.listener.remove_device(info.server,
+                                            self.discoveries[info.server])
 
-        if info.server in self.discoveries:
-            del(self.discoveries[info.server])
+            if info.server in self.discoveries:
+                self._heard_announcement = True
+                del(self.discoveries[info.server])