Fixing race condition in geo location platforms (#17581)

* fixed race condition where obsolete entities kept listening for dispatcher signals

* making tests python 3.5 compatible
This commit is contained in:
Malte Franken authored and Martin Hjelmare committed 2018-10-18 15:25:48 +02:00
1 parent 7e91c0dc83
commit 7eb6e49df7
3 files changed
+100 -4

No files matched your search

@@ -152,19 +152,23 @@ class GeoJsonLocationEvent(GeoLocationEvent):
self._distance = None
self._latitude = None
self._longitude = None
self._remove_signal_delete = None
self._remove_signal_update = None
async def async_added_to_hass(self):
"""Call when entity is added to hass."""
async_dispatcher_connect(
self._remove_signal_delete = async_dispatcher_connect(
self.hass, SIGNAL_DELETE_ENTITY.format(self._external_id),
self._delete_callback)
async_dispatcher_connect(
self._remove_signal_update = async_dispatcher_connect(
self.hass, SIGNAL_UPDATE_ENTITY.format(self._external_id),
self._update_callback)
@callback
def _delete_callback(self):
"""Remove this entity."""
self._remove_signal_delete()
self._remove_signal_update()
self.hass.async_create_task(self.async_remove())
@callback
@@ -183,19 +183,23 @@ class NswRuralFireServiceLocationEvent(GeoLocationEvent):
self._fire = None
self._size = None
self._responsible_agency = None
self._remove_signal_delete = None
self._remove_signal_update = None
async def async_added_to_hass(self):
"""Call when entity is added to hass."""
async_dispatcher_connect(
self._remove_signal_delete = async_dispatcher_connect(
self.hass, SIGNAL_DELETE_ENTITY.format(self._external_id),
self._delete_callback)
async_dispatcher_connect(
self._remove_signal_update = async_dispatcher_connect(
self.hass, SIGNAL_UPDATE_ENTITY.format(self._external_id),
self._update_callback)
@callback
def _delete_callback(self):
"""Remove this entity."""
self._remove_signal_delete()
self._remove_signal_update()
self.hass.async_create_task(self.async_remove())
@callback