Mirrored_Repos/python-kasa
1
0
Fork 0
mirror of https://github.com/python-kasa/python-kasa.git synced 2025-11-04 22:51:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Put child fixtures in subfolder (#809)

Browse Source 
This should prevent child fixtures from hubs breaking tests due to
missing discovery info. To get these devices in `filter_fixtures`
include protocol string of `SMART.CHILD`.
This commit is contained in:
Steven B
2024-03-06 14:54:55 +00:00
committed by GitHub
parent 0d5a3c8439
commit ced879498b
5 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kasa/tests/discovery_fixtures.py
View File

@@ -8,7 +8,7 @@ from kasa.xortransport import XorEncryption
from .fakeprotocol_iot import FakeIotProtocol
from .fakeprotocol_smart import FakeSmartProtocol
from .fixtureinfo import FIXTURE_DATA, FixtureInfo, filter_fixtures, idgenerator
from .fixtureinfo import FixtureInfo, filter_fixtures, idgenerator
def _make_unsupported(device_family, encrypt_type):
@@ -42,8 +42,10 @@ UNSUPPORTED_DEVICES = {
}
def parametrize_discovery(desc, root_key):
filtered_fixtures = filter_fixtures(desc, data_root_filter=root_key)
def parametrize_discovery(desc, *, data_root_filter, protocol_filter=None):
filtered_fixtures = filter_fixtures(
desc, data_root_filter=data_root_filter, protocol_filter=protocol_filter
)
return pytest.mark.parametrize(
"discovery_mock",
filtered_fixtures,
@@ -52,10 +54,15 @@ def parametrize_discovery(desc, root_key):
)
new_discovery = parametrize_discovery("new discovery", "discovery_result")
new_discovery = parametrize_discovery(
"new discovery", data_root_filter="discovery_result"
)
@pytest.fixture(params=FIXTURE_DATA, ids=idgenerator)
@pytest.fixture(
params=filter_fixtures("discoverable", protocol_filter={"SMART", "IOT"}),
ids=idgenerator,
)
def discovery_mock(request, mocker):
fixture_info: FixtureInfo = request.param
fixture_data = fixture_info.data
@@ -128,7 +135,7 @@ def discovery_mock(request, mocker):
side_effect=lambda *_, **__: [(None, None, None, None, (dm.ip, 0))],
)
if fixture_info.protocol == "SMART":
if "SMART" in fixture_info.protocol:
proto = FakeSmartProtocol(fixture_data, fixture_info.name)
else:
proto = FakeIotProtocol(fixture_data)
@@ -142,7 +149,10 @@ def discovery_mock(request, mocker):
yield dm
@pytest.fixture(params=FIXTURE_DATA, ids=idgenerator)
@pytest.fixture(
params=filter_fixtures("discoverable", protocol_filter={"SMART", "IOT"}),
ids=idgenerator,
)
def discovery_data(request, mocker):
"""Return raw discovery file contents as JSON. Used for discovery tests."""
fixture_info = request.param