python-kasa · sdb9696 · Mar 6, 2024 · Feb 27, 2024 · Mar 4, 2024 · Mar 6, 2024
diff --git a/kasa/module.py b/kasa/module.py
@@ -37,7 +37,11 @@ def data(self):
 
     def _add_feature(self, feature: Feature):
         """Add module feature."""
-        feat_name = f"{self._module}_{feature.name}"
+
+        def _slugified_name(name):
+            return name.lower().replace(" ", "_").replace("'", "_")
+
+        feat_name = _slugified_name(feature.name)
         if feat_name in self._module_features:
             raise KasaException("Duplicate name detected %s" % feat_name)
         self._module_features[feat_name] = feature

diff --git a/kasa/smart/modules/temperature.py b/kasa/smart/modules/temperature.py
@@ -11,7 +11,7 @@
 class TemperatureSensor(SmartModule):
     """Implementation of temperature module."""
 
-    REQUIRED_COMPONENT = "humidity"
+    REQUIRED_COMPONENT = "temperature"
     QUERY_GETTER_NAME = "get_comfort_temp_config"
 
     def __init__(self, device: "SmartDevice", module: str):
@@ -53,7 +53,7 @@ def temperature(self):
 
     @property
     def temperature_warning(self) -> bool:
-        """Return True if humidity is outside of the wanted range."""
+        """Return True if temperature is outside of the wanted range."""
         return self._device.sys_info["current_temp_exception"] != 0
 
     @property

diff --git a/kasa/tests/conftest.py b/kasa/tests/conftest.py
@@ -2,7 +2,7 @@
 from typing import Dict
 from unittest.mock import MagicMock
 
-import pytest  # type: ignore # see https://github.com/pytest-dev/pytest/issues/3342
+import pytest
 
 from kasa import (
     DeviceConfig,

diff --git a/kasa/tests/device_fixtures.py b/kasa/tests/device_fixtures.py
@@ -1,3 +1,4 @@
+from itertools import chain
 from typing import Dict, List, Set
 
 import pytest
@@ -106,6 +107,7 @@
 }
 
 HUBS_SMART = {"H100"}
+SENSORS_SMART = {"T315"}
 
 WITH_EMETER_IOT = {"HS110", "HS300", "KP115", "KP125", *BULBS_IOT}
 WITH_EMETER_SMART = {"P110", "KP125M", "EP25"}
@@ -121,6 +123,7 @@
     .union(STRIPS_SMART)
     .union(DIMMERS_SMART)
     .union(HUBS_SMART)
+    .union(SENSORS_SMART)
     .union(SWITCHES_SMART)
 )
 ALL_DEVICES = ALL_DEVICES_IOT.union(ALL_DEVICES_SMART)
@@ -263,6 +266,9 @@ def parametrize(
 hubs_smart = parametrize(
     "hubs smart", model_filter=HUBS_SMART, protocol_filter={"SMART"}
 )
+sensors_smart = parametrize(
+    "sensors smart", model_filter=SENSORS_SMART, protocol_filter={"SMART.CHILD"}
+)
 device_smart = parametrize(
     "devices smart", model_filter=ALL_DEVICES_SMART, protocol_filter={"SMART"}
 )
@@ -283,6 +289,7 @@ def check_categories():
         + bulb_smart.args[1]
         + dimmers_smart.args[1]
         + hubs_smart.args[1]
+        + sensors_smart.args[1]
     )
     diffs: Set[FixtureInfo] = set(FIXTURE_DATA) - set(categorized_fixtures)
     if diffs:
@@ -299,24 +306,14 @@ def check_categories():
 
 def device_for_fixture_name(model, protocol):
     if "SMART" in protocol:
-        for d in PLUGS_SMART:
-            if d in model:
-                return SmartDevice
-        for d in SWITCHES_SMART:
+        for d in chain(
+            PLUGS_SMART, SWITCHES_SMART, STRIPS_SMART, HUBS_SMART, SENSORS_SMART
+        ):
             if d in model:
                 return SmartDevice
-        for d in BULBS_SMART:
-            if d in model:
-                return SmartBulb
-        for d in DIMMERS_SMART:
+        for d in chain(BULBS_SMART, DIMMERS_SMART):
             if d in model:
                 return SmartBulb
-        for d in STRIPS_SMART:
-            if d in model:
-                return SmartDevice
-        for d in HUBS_SMART:
-            if d in model:
-                return SmartDevice
     else:
         for d in STRIPS_IOT:
             if d in model:
@@ -378,7 +375,8 @@ async def get_device_for_fixture(fixture_data: FixtureInfo):
         discovery_data = {
             "system": {"get_sysinfo": fixture_data.data["system"]["get_sysinfo"]}
         }
-    if discovery_data:  # Child devices do not have discovery info
+
+    if discovery_data: # Child devices do not have discovery info
         d.update_from_discover_info(discovery_data)
 
     await _update_and_close(d)
@@ -392,7 +390,7 @@ async def get_device_for_fixture_protocol(fixture, protocol):
             return await get_device_for_fixture(fixture_info)
 
 
-@pytest.fixture(params=FIXTURE_DATA, ids=idgenerator)
+@pytest.fixture(params=filter_fixtures("main devices"), ids=idgenerator)
 async def dev(request):
     """Device fixture.
 

diff --git a/kasa/tests/fixtureinfo.py b/kasa/tests/fixtureinfo.py
@@ -93,7 +93,7 @@ def filter_fixtures(
 
     data_root_filter: return fixtures containing the supplied top
         level key, i.e. discovery_result
-    protocol_filter: set of protocols to match, IOT or SMART
+    protocol_filter: set of protocols to match, IOT, SMART, SMART.CHILD
     model_filter: set of device models to match
     component_filter: filter SMART fixtures that have the provided
     component in component_nego details.

diff --git a/kasa/tests/fixtures/smart/child/.gitkeep b/kasa/tests/fixtures/smart/child/.gitkeep