From 99328bd4c1704819ea3bd3bed19bb69646a4e333 Mon Sep 17 00:00:00 2001
From: Robert Svensson <Kane610@users.noreply.github.com>
Date: Tue, 10 Dec 2019 20:05:18 +0100
Subject: [PATCH] UniFi - honor detection time when UniFi wire bug happens
 (#29820)

---
 .../components/unifi/device_tracker.py        | 18 ++++++++++++------
 tests/components/unifi/test_device_tracker.py | 19 ++++++++++++++++---
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/unifi/device_tracker.py b/homeassistant/components/unifi/device_tracker.py
index 159949f2985..6c3701e883d 100644
--- a/homeassistant/components/unifi/device_tracker.py
+++ b/homeassistant/components/unifi/device_tracker.py
@@ -127,6 +127,7 @@ class UniFiClientTracker(ScannerEntity):
         self.client = client
         self.controller = controller
         self.is_wired = self.client.mac not in controller.wireless_clients
+        self.wired_bug = None
 
     @property
     def entity_registry_enabled_default(self):
@@ -169,13 +170,18 @@ class UniFiClientTracker(ScannerEntity):
 
         If is_wired and client.is_wired differ it means that the device is offline and UniFi bug shows device as wired.
         """
-        if self.is_wired == self.client.is_wired and (
-            (
-                dt_util.utcnow()
-                - dt_util.utc_from_timestamp(float(self.client.last_seen))
+        if self.is_wired != self.client.is_wired:
+            if not self.wired_bug:
+                self.wired_bug = dt_util.utcnow()
+            since_last_seen = dt_util.utcnow() - self.wired_bug
+
+        else:
+            self.wired_bug = None
+            since_last_seen = dt_util.utcnow() - dt_util.utc_from_timestamp(
+                float(self.client.last_seen)
             )
-            < self.controller.option_detection_time
-        ):
+
+        if since_last_seen < self.controller.option_detection_time:
             return True
 
         return False
diff --git a/tests/components/unifi/test_device_tracker.py b/tests/components/unifi/test_device_tracker.py
index 634247a5283..42ba83a1612 100644
--- a/tests/components/unifi/test_device_tracker.py
+++ b/tests/components/unifi/test_device_tracker.py
@@ -2,6 +2,8 @@
 from copy import copy
 from datetime import timedelta
 
+from asynctest import patch
+
 from homeassistant import config_entries
 from homeassistant.components import unifi
 import homeassistant.components.device_tracker as device_tracker
@@ -17,8 +19,6 @@ import homeassistant.util.dt as dt_util
 
 from .test_controller import ENTRY_CONFIG, SITES, setup_unifi_integration
 
-DEFAULT_DETECTION_TIME = timedelta(seconds=300)
-
 CLIENT_1 = {
     "essid": "ssid",
     "hostname": "client_1",
@@ -202,7 +202,20 @@ async def test_wireless_client_go_wired_issue(hass):
     await hass.async_block_till_done()
 
     client_1 = hass.states.get("device_tracker.client_1")
-    assert client_1.state == "not_home"
+    assert client_1.state == "home"
+
+    with patch.object(
+        unifi.device_tracker.dt_util,
+        "utcnow",
+        return_value=(dt_util.utcnow() + timedelta(minutes=5)),
+    ):
+        controller.mock_client_responses.append([client_1_client])
+        controller.mock_device_responses.append({})
+        await controller.async_update()
+        await hass.async_block_till_done()
+
+        client_1 = hass.states.get("device_tracker.client_1")
+        assert client_1.state == "not_home"
 
     client_1_client["is_wired"] = False
     client_1_client["last_seen"] = dt_util.as_timestamp(dt_util.utcnow())