Merge pull request #53 from dmamontov/dev

Fix bugs and add tests

.coveragerc

@@ -0,0 +1,2 @@
+[run]
+source = custom_components/miwifi

.gitignore

@@ -129,3 +129,4 @@ dmypy.json
 .pyre/
 
 .DS_Store
+.idea

custom_components/__init__.py

@@ -0,0 +1 @@
+"""MiWifi custom integration."""

custom_components/miwifi/luci.py

@@ -162,7 +162,7 @@ async def get(
             self._debug("Successful request", _url, response.content, path)
 
             _data: dict = json.loads(response.content)
-        except (HTTPError, ValueError, TypeError) as _e:
+        except (HTTPError, ValueError, TypeError, json.JSONDecodeError) as _e:
             self._debug("Connection error", _url, _e, path)
 
             raise LuciConnectionException("Connection error") from _e

custom_components/miwifi/updater.py

@@ -238,12 +238,14 @@ async def update(self, retry: int = 1) -> dict:
 
         await self._async_load_manufacturers()
 
+        self.code = codes.OK
+
         _is_before_reauthorization: bool = self._is_reauthorization
         _err: LuciException | None = None
 
         try:
             if self._is_reauthorization or self._is_only_login or self._is_first_update:
-                if self._is_first_update:
+                if self._is_first_update and retry == 1:
                     await self.luci.logout()
                     await asyncio.sleep(DEFAULT_CALL_DELAY)
 
@@ -263,8 +265,6 @@ async def update(self, retry: int = 1) -> dict:
             self._is_reauthorization = True
             self.code = codes.FORBIDDEN
         else:
-            self.code = codes.OK
-
             self._is_reauthorization = False
 
             if self._is_first_update:
@@ -279,7 +279,11 @@ async def update(self, retry: int = 1) -> dict:
         ):
             self.data[ATTR_STATE] = True
 
-        if self._is_first_update and not self.data[ATTR_STATE]:
+        if (
+            not self._is_only_login
+            and self._is_first_update
+            and not self.data[ATTR_STATE]
+        ):
             if retry > DEFAULT_RETRY and _err is not None:
                 raise _err
 
@@ -403,6 +407,8 @@ async def _async_prepare_init(self, data: dict) -> None:
 
                 self.code = codes.CONFLICT
 
+                return
+
             data[ATTR_CAMERA_IMAGE] = await self.luci.image(response["hardware"])
 
             return
@@ -467,8 +473,6 @@ async def _async_prepare_rom_update(self, data: dict) -> None:
         if ATTR_UPDATE_CURRENT_VERSION not in data:
             return
 
-        response: dict = await self.luci.rom_update()
-
         _rom_info: dict = {
             ATTR_UPDATE_CURRENT_VERSION: data[ATTR_UPDATE_CURRENT_VERSION],
             ATTR_UPDATE_LATEST_VERSION: data[ATTR_UPDATE_CURRENT_VERSION],
@@ -477,7 +481,16 @@ async def _async_prepare_rom_update(self, data: dict) -> None:
             + f" ({data.get(ATTR_DEVICE_NAME, DEFAULT_NAME)})",
         }
 
-        if "needUpdate" not in response or response["needUpdate"] != 1:
+        try:
+            response: dict = await self.luci.rom_update()
+        except LuciException:
+            response = {}
+
+        if (
+            not isinstance(response, dict)
+            or "needUpdate" not in response
+            or response["needUpdate"] != 1
+        ):
             data[ATTR_UPDATE_FIRMWARE] = _rom_info
 
             return
@@ -549,7 +562,7 @@ async def _async_prepare_wifi(self, data: dict) -> None:
         response: dict = await self.luci.wifi_detail_all()
 
         if "bsd" in response:
-            data[ATTR_BINARY_SENSOR_DUAL_BAND] = response["bsd"] == 1
+            data[ATTR_BINARY_SENSOR_DUAL_BAND] = int(response["bsd"]) == 1
         else:
             data[ATTR_BINARY_SENSOR_DUAL_BAND] = False
 
@@ -587,7 +600,7 @@ async def _async_prepare_wifi(self, data: dict) -> None:
 
             for data_field, field in ATTR_WIFI_DATA_FIELDS.items():
                 if "channelInfo" in data_field and "channelInfo" in wifi:
-                    data_field = data_field.replace("channelInfo", "")
+                    data_field = data_field.replace("channelInfo.", "")
 
                     if data_field in wifi["channelInfo"]:
                         wifi_data[field] = wifi["channelInfo"][data_field]

requirements_test.txt

@@ -0,0 +1,10 @@
+aiohttp_cors==0.7.0
+aiodiscover==1.4.8
+scapy==2.4.5
+async_upnp_client==0.27.0
+
+codecov==2.1.12
+coverage==6.3.2
+pytest==7.1.1
+pytest-cov==2.12.1
+pytest-homeassistant-custom-component==0.8.11

tests/__init__.py

@@ -0,0 +1 @@
+"""Tests for the miwifi component."""

tests/fixtures/avaliable_channels_2g_data.json

@@ -0,0 +1,103 @@
+{
+  "list": [
+    {
+      "c": "0",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "1",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "2",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "3",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "4",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "5",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "6",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "7",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "8",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "9",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "10",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "11",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "12",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "13",
+      "b": [
+        "20",
+        "40"
+      ]
+    }
+  ],
+  "code": 0
+}

tests/fixtures/avaliable_channels_5g_data.json

@@ -0,0 +1,76 @@
+{
+  "list": [
+    {
+      "c": "0",
+      "b": [
+        "20",
+        "40"
+      ]
+    },
+    {
+      "c": "36",
+      "b": [
+        "20",
+        "40",
+        "80"
+      ]
+    },
+    {
+      "c": "40",
+      "b": [
+        "20",
+        "40",
+        "80"
+      ]
+    },
+    {
+      "c": "44",
+      "b": [
+        "20",
+        "40",
+        "80"
+      ]
+    },
+    {
+      "c": "48",
+      "b": [
+        "20",
+        "40",
+        "80"
+      ]
+    },
+    {
+      "c": "149",
+      "b": [
+        "20",
+        "40",
+        "80"
+      ]
+    },
+    {
+      "c": "153",
+      "b": [
+        "20",
+        "40",
+        "80"
+      ]
+    },
+    {
+      "c": "157",
+      "b": [
+        "20",
+        "40",
+        "80"
+      ]
+    },
+    {
+      "c": "161",
+      "b": [
+        "20",
+        "40",
+        "80"
+      ]
+    }
+  ],
+  "code": 0
+}