From 5df29ff6d01e48dff10c46ae03824f89bba5d632 Mon Sep 17 00:00:00 2001 From: Steven B <51370195+sdb9696@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:13:04 +0000 Subject: [PATCH 1/2] Move tests folder to top level of project --- devtools/dump_devinfo.py | 10 +++++----- devtools/generate_supported.py | 4 ++-- docs/source/contribute.md | 2 +- pyproject.toml | 9 ++++----- {kasa/tests => tests}/__init__.py | 0 {kasa/tests => tests}/conftest.py | 0 {kasa/tests => tests}/device_fixtures.py | 0 {kasa/tests => tests}/discovery_fixtures.py | 0 {kasa/tests => tests}/fakeprotocol_iot.py | 6 +++--- {kasa/tests => tests}/fakeprotocol_smart.py | 0 .../fakeprotocol_smartcamera.py | 0 {kasa/tests => tests}/fixtureinfo.py | 0 .../fixtures/EP10(US)_1.0_1.0.2.json | 0 .../fixtures/EP40(US)_1.0_1.0.2.json | 0 .../fixtures/ES20M(US)_1.0_1.0.11.json | 0 .../fixtures/ES20M(US)_1.0_1.0.8.json | 0 .../fixtures/HS100(UK)_1.0_1.2.6.json | 0 .../fixtures/HS100(UK)_4.1_1.1.0.json | 0 .../fixtures/HS100(US)_1.0_1.2.5.json | 0 .../fixtures/HS100(US)_2.0_1.5.6.json | 0 .../fixtures/HS103(US)_1.0_1.5.7.json | 0 .../fixtures/HS103(US)_2.1_1.1.2.json | 0 .../fixtures/HS103(US)_2.1_1.1.4.json | 0 .../fixtures/HS105(US)_1.0_1.5.6.json | 0 .../fixtures/HS107(US)_1.0_1.0.8.json | 0 .../fixtures/HS110(EU)_1.0_1.2.5.json | 0 .../fixtures/HS110(EU)_4.0_1.0.4.json | 0 .../fixtures/HS110(US)_1.0_1.2.6.json | 0 .../fixtures/HS200(US)_2.0_1.5.7.json | 0 .../fixtures/HS200(US)_3.0_1.1.5.json | 0 .../fixtures/HS200(US)_5.0_1.0.11.json | 0 .../fixtures/HS200(US)_5.0_1.0.2.json | 0 .../fixtures/HS210(US)_1.0_1.5.8.json | 0 .../fixtures/HS210(US)_2.0_1.1.5.json | 0 .../fixtures/HS220(US)_1.0_1.5.7.json | 0 .../fixtures/HS220(US)_2.0_1.0.3.json | 0 .../fixtures/HS300(US)_1.0_1.0.10.json | 0 .../fixtures/HS300(US)_1.0_1.0.21.json | 0 .../fixtures/HS300(US)_2.0_1.0.12.json | 0 .../fixtures/HS300(US)_2.0_1.0.3.json | 0 .../fixtures/KL110(US)_1.0_1.8.11.json | 0 .../fixtures/KL120(US)_1.0_1.8.11.json | 0 .../fixtures/KL120(US)_1.0_1.8.6.json | 0 .../fixtures/KL125(US)_1.20_1.0.5.json | 0 .../fixtures/KL125(US)_2.0_1.0.7.json | 0 .../fixtures/KL125(US)_4.0_1.0.5.json | 0 .../fixtures/KL130(EU)_1.0_1.8.8.json | 0 .../fixtures/KL130(US)_1.0_1.8.11.json | 0 .../fixtures/KL135(US)_1.0_1.0.15.json | 0 .../fixtures/KL135(US)_1.0_1.0.6.json | 0 .../fixtures/KL400L5(US)_1.0_1.0.5.json | 0 .../fixtures/KL400L5(US)_1.0_1.0.8.json | 0 .../fixtures/KL420L5(US)_1.0_1.0.2.json | 0 .../fixtures/KL430(UN)_2.0_1.0.8.json | 0 .../fixtures/KL430(US)_1.0_1.0.10.json | 0 .../fixtures/KL430(US)_2.0_1.0.11.json | 0 .../fixtures/KL430(US)_2.0_1.0.8.json | 0 .../fixtures/KL430(US)_2.0_1.0.9.json | 0 .../fixtures/KL50(US)_1.0_1.1.13.json | 0 .../fixtures/KL60(UN)_1.0_1.1.4.json | 0 .../fixtures/KL60(US)_1.0_1.1.13.json | 0 .../fixtures/KP100(US)_3.0_1.0.1.json | 0 .../fixtures/KP105(UK)_1.0_1.0.5.json | 0 .../fixtures/KP105(UK)_1.0_1.0.7.json | 0 .../fixtures/KP115(EU)_1.0_1.0.16.json | 0 .../fixtures/KP115(US)_1.0_1.0.17.json | 0 .../fixtures/KP115(US)_1.0_1.0.21.json | 0 .../fixtures/KP125(US)_1.0_1.0.6.json | 0 .../fixtures/KP200(US)_3.0_1.0.3.json | 0 .../fixtures/KP303(UK)_1.0_1.0.3.json | 0 .../fixtures/KP303(US)_2.0_1.0.3.json | 0 .../fixtures/KP303(US)_2.0_1.0.9.json | 0 .../fixtures/KP400(US)_1.0_1.0.10.json | 0 .../fixtures/KP400(US)_2.0_1.0.6.json | 0 .../fixtures/KP400(US)_3.0_1.0.3.json | 0 .../fixtures/KP400(US)_3.0_1.0.4.json | 0 .../fixtures/KP401(US)_1.0_1.0.0.json | 0 .../fixtures/KP405(US)_1.0_1.0.5.json | 0 .../fixtures/KP405(US)_1.0_1.0.6.json | 0 .../fixtures/KS200M(US)_1.0_1.0.10.json | 0 .../fixtures/KS200M(US)_1.0_1.0.11.json | 0 .../fixtures/KS200M(US)_1.0_1.0.12.json | 0 .../fixtures/KS200M(US)_1.0_1.0.8.json | 0 .../fixtures/KS220(US)_1.0_1.0.13.json | 0 .../fixtures/KS220M(US)_1.0_1.0.4.json | 0 .../fixtures/KS230(US)_1.0_1.0.14.json | 0 .../fixtures/LB110(US)_1.0_1.8.11.json | 0 .../fixtures/smart/EP25(US)_2.6_1.0.1.json | 0 .../fixtures/smart/EP25(US)_2.6_1.0.2.json | 0 .../fixtures/smart/EP40M(US)_1.0_1.1.0.json | 0 .../fixtures/smart/H100(EU)_1.0_1.2.3.json | 0 .../fixtures/smart/H100(EU)_1.0_1.5.10.json | 0 .../fixtures/smart/H100(EU)_1.0_1.5.5.json | 0 .../fixtures/smart/HS220(US)_3.26_1.0.1.json | 0 .../fixtures/smart/KH100(EU)_1.0_1.2.3.json | 0 .../fixtures/smart/KH100(EU)_1.0_1.5.12.json | 0 .../fixtures/smart/KH100(UK)_1.0_1.5.6.json | 0 .../fixtures/smart/KP125M(US)_1.0_1.1.3.json | 0 .../fixtures/smart/KP125M(US)_1.0_1.2.3.json | 0 .../fixtures/smart/KS205(US)_1.0_1.0.2.json | 0 .../fixtures/smart/KS205(US)_1.0_1.1.0.json | 0 .../fixtures/smart/KS225(US)_1.0_1.0.2.json | 0 .../fixtures/smart/KS225(US)_1.0_1.1.0.json | 0 .../fixtures/smart/KS240(US)_1.0_1.0.4.json | 0 .../fixtures/smart/KS240(US)_1.0_1.0.5.json | 0 .../fixtures/smart/KS240(US)_1.0_1.0.7.json | 0 .../fixtures/smart/L510B(EU)_3.0_1.0.5.json | 0 .../fixtures/smart/L510E(US)_3.0_1.0.5.json | 0 .../fixtures/smart/L510E(US)_3.0_1.1.2.json | 0 .../fixtures/smart/L530E(EU)_3.0_1.0.6.json | 0 .../fixtures/smart/L530E(EU)_3.0_1.1.0.json | 0 .../fixtures/smart/L530E(EU)_3.0_1.1.6.json | 0 .../fixtures/smart/L530E(US)_2.0_1.1.0.json | 0 .../fixtures/smart/L630(EU)_1.0_1.1.2.json | 0 .../smart/L900-10(EU)_1.0_1.0.17.json | 0 .../smart/L900-10(US)_1.0_1.0.11.json | 0 .../fixtures/smart/L900-5(EU)_1.0_1.0.17.json | 0 .../fixtures/smart/L900-5(EU)_1.0_1.1.0.json | 0 .../fixtures/smart/L920-5(EU)_1.0_1.0.7.json | 0 .../fixtures/smart/L920-5(EU)_1.0_1.1.3.json | 0 .../fixtures/smart/L920-5(US)_1.0_1.1.0.json | 0 .../fixtures/smart/L920-5(US)_1.0_1.1.3.json | 0 .../fixtures/smart/L930-5(US)_1.0_1.1.2.json | 0 .../fixtures/smart/P100_1.0.0_1.1.3.json | 0 .../fixtures/smart/P100_1.0.0_1.3.7.json | 0 .../fixtures/smart/P100_1.0.0_1.4.0.json | 0 .../fixtures/smart/P110(EU)_1.0_1.0.7.json | 0 .../fixtures/smart/P110(EU)_1.0_1.2.3.json | 0 .../fixtures/smart/P110(UK)_1.0_1.3.0.json | 0 .../fixtures/smart/P115(EU)_1.0_1.2.3.json | 0 .../fixtures/smart/P125M(US)_1.0_1.1.0.json | 0 .../fixtures/smart/P135(US)_1.0_1.0.5.json | 0 .../fixtures/smart/P300(EU)_1.0_1.0.13.json | 0 .../fixtures/smart/P300(EU)_1.0_1.0.15.json | 0 .../fixtures/smart/P300(EU)_1.0_1.0.7.json | 0 .../fixtures/smart/P304M(UK)_1.0_1.0.3.json | 0 .../fixtures/smart/S500D(US)_1.0_1.0.5.json | 0 .../fixtures/smart/S505(US)_1.0_1.0.2.json | 0 .../fixtures/smart/S505D(US)_1.0_1.1.0.json | 0 .../fixtures/smart/TP15(US)_1.0_1.0.3.json | 0 .../fixtures/smart/TP25(US)_1.0_1.0.2.json | 0 .../smart/child/KE100(EU)_1.0_2.4.0.json | 0 .../smart/child/KE100(EU)_1.0_2.8.0.json | 0 .../smart/child/KE100(UK)_1.0_2.8.0.json | 0 .../smart/child/S200B(EU)_1.0_1.11.0.json | 0 .../smart/child/S200B(US)_1.0_1.12.0.json | 0 .../smart/child/S200D(EU)_1.0_1.11.0.json | 0 .../smart/child/S200D(EU)_1.0_1.12.0.json | 0 .../smart/child/T100(EU)_1.0_1.12.0.json | 0 .../smart/child/T110(EU)_1.0_1.8.0.json | 0 .../smart/child/T110(EU)_1.0_1.9.0.json | 0 .../smart/child/T110(US)_1.0_1.9.0.json | 0 .../smart/child/T300(EU)_1.0_1.7.0.json | 0 .../smart/child/T310(EU)_1.0_1.5.0.json | 0 .../smart/child/T310(US)_1.0_1.5.0.json | 0 .../smart/child/T315(EU)_1.0_1.7.0.json | 0 .../smart/child/T315(US)_1.0_1.8.0.json | 0 .../smartcamera/C210(EU)_2.0_1.4.2.json | 0 .../smartcamera/C210(EU)_2.0_1.4.3.json | 0 .../smartcamera/H200(EU)_1.0_1.3.2.json | 0 .../smartcamera/H200(US)_1.0_1.3.6.json | 0 .../fixtures/smartcamera/TC65_1.0_1.3.9.json | 0 .../iot/modules => tests/iot}/__init__.py | 0 .../smart => tests/iot/modules}/__init__.py | 0 .../iot/modules/test_ambientlight.py | 3 ++- .../iot/modules/test_motion.py | 3 ++- {kasa/tests => tests}/iot/test_wallswitch.py | 2 +- .../features => tests/smart}/__init__.py | 0 .../smart/features}/__init__.py | 0 .../smart/features/test_brightness.py | 3 ++- .../smart/features/test_colortemp.py | 3 ++- .../smart/modules}/__init__.py | 0 .../smart/modules/test_autooff.py | 3 ++- .../smart/modules/test_childprotection.py | 3 ++- .../smart/modules/test_contact.py | 3 ++- .../tests => tests}/smart/modules/test_fan.py | 3 ++- .../smart/modules/test_firmware.py | 3 ++- .../smart/modules/test_humidity.py | 3 ++- .../smart/modules/test_light_effect.py | 3 ++- .../smart/modules/test_light_strip_effect.py | 3 ++- .../smart/modules/test_lighttransition.py | 5 +++-- .../smart/modules/test_motionsensor.py | 3 ++- .../smart/modules/test_temperature.py | 3 ++- .../smart/modules/test_temperaturecontrol.py | 3 ++- .../smart/modules/test_waterleak.py | 3 ++- tests/smartcamera/__init__.py | 0 .../smartcamera/test_smartcamera.py | 0 {kasa/tests => tests}/test_aestransport.py | 10 +++++----- {kasa/tests => tests}/test_bulb.py | 0 {kasa/tests => tests}/test_childdevice.py | 0 {kasa/tests => tests}/test_cli.py | 0 {kasa/tests => tests}/test_common_modules.py | 3 ++- {kasa/tests => tests}/test_device.py | 0 {kasa/tests => tests}/test_device_factory.py | 0 {kasa/tests => tests}/test_device_type.py | 0 {kasa/tests => tests}/test_deviceconfig.py | 0 {kasa/tests => tests}/test_dimmer.py | 0 {kasa/tests => tests}/test_discovery.py | 0 {kasa/tests => tests}/test_emeter.py | 0 {kasa/tests => tests}/test_feature.py | 0 {kasa/tests => tests}/test_httpclient.py | 6 +++--- {kasa/tests => tests}/test_iotdevice.py | 0 {kasa/tests => tests}/test_klapprotocol.py | 18 ++++++++--------- {kasa/tests => tests}/test_lightstrip.py | 0 {kasa/tests => tests}/test_plug.py | 0 {kasa/tests => tests}/test_protocol.py | 20 +++++++++---------- {kasa/tests => tests}/test_readme_examples.py | 2 +- {kasa/tests => tests}/test_smartdevice.py | 0 {kasa/tests => tests}/test_smartprotocol.py | 8 ++++---- {kasa/tests => tests}/test_sslaestransport.py | 19 ++++++++++-------- {kasa/tests => tests}/test_strip.py | 0 {kasa/tests => tests}/test_usage.py | 0 212 files changed, 96 insertions(+), 76 deletions(-) rename {kasa/tests => tests}/__init__.py (100%) rename {kasa/tests => tests}/conftest.py (100%) rename {kasa/tests => tests}/device_fixtures.py (100%) rename {kasa/tests => tests}/discovery_fixtures.py (100%) rename {kasa/tests => tests}/fakeprotocol_iot.py (99%) rename {kasa/tests => tests}/fakeprotocol_smart.py (100%) rename {kasa/tests => tests}/fakeprotocol_smartcamera.py (100%) rename {kasa/tests => tests}/fixtureinfo.py (100%) rename {kasa/tests => tests}/fixtures/EP10(US)_1.0_1.0.2.json (100%) rename {kasa/tests => tests}/fixtures/EP40(US)_1.0_1.0.2.json (100%) rename {kasa/tests => tests}/fixtures/ES20M(US)_1.0_1.0.11.json (100%) rename {kasa/tests => tests}/fixtures/ES20M(US)_1.0_1.0.8.json (100%) rename {kasa/tests => tests}/fixtures/HS100(UK)_1.0_1.2.6.json (100%) rename {kasa/tests => tests}/fixtures/HS100(UK)_4.1_1.1.0.json (100%) rename {kasa/tests => tests}/fixtures/HS100(US)_1.0_1.2.5.json (100%) rename {kasa/tests => tests}/fixtures/HS100(US)_2.0_1.5.6.json (100%) rename {kasa/tests => tests}/fixtures/HS103(US)_1.0_1.5.7.json (100%) rename {kasa/tests => tests}/fixtures/HS103(US)_2.1_1.1.2.json (100%) rename {kasa/tests => tests}/fixtures/HS103(US)_2.1_1.1.4.json (100%) rename {kasa/tests => tests}/fixtures/HS105(US)_1.0_1.5.6.json (100%) rename {kasa/tests => tests}/fixtures/HS107(US)_1.0_1.0.8.json (100%) rename {kasa/tests => tests}/fixtures/HS110(EU)_1.0_1.2.5.json (100%) rename {kasa/tests => tests}/fixtures/HS110(EU)_4.0_1.0.4.json (100%) rename {kasa/tests => tests}/fixtures/HS110(US)_1.0_1.2.6.json (100%) rename {kasa/tests => tests}/fixtures/HS200(US)_2.0_1.5.7.json (100%) rename {kasa/tests => tests}/fixtures/HS200(US)_3.0_1.1.5.json (100%) rename {kasa/tests => tests}/fixtures/HS200(US)_5.0_1.0.11.json (100%) rename {kasa/tests => tests}/fixtures/HS200(US)_5.0_1.0.2.json (100%) rename {kasa/tests => tests}/fixtures/HS210(US)_1.0_1.5.8.json (100%) rename {kasa/tests => tests}/fixtures/HS210(US)_2.0_1.1.5.json (100%) rename {kasa/tests => tests}/fixtures/HS220(US)_1.0_1.5.7.json (100%) rename {kasa/tests => tests}/fixtures/HS220(US)_2.0_1.0.3.json (100%) rename {kasa/tests => tests}/fixtures/HS300(US)_1.0_1.0.10.json (100%) rename {kasa/tests => tests}/fixtures/HS300(US)_1.0_1.0.21.json (100%) rename {kasa/tests => tests}/fixtures/HS300(US)_2.0_1.0.12.json (100%) rename {kasa/tests => tests}/fixtures/HS300(US)_2.0_1.0.3.json (100%) rename {kasa/tests => tests}/fixtures/KL110(US)_1.0_1.8.11.json (100%) rename {kasa/tests => tests}/fixtures/KL120(US)_1.0_1.8.11.json (100%) rename {kasa/tests => tests}/fixtures/KL120(US)_1.0_1.8.6.json (100%) rename {kasa/tests => tests}/fixtures/KL125(US)_1.20_1.0.5.json (100%) rename {kasa/tests => tests}/fixtures/KL125(US)_2.0_1.0.7.json (100%) rename {kasa/tests => tests}/fixtures/KL125(US)_4.0_1.0.5.json (100%) rename {kasa/tests => tests}/fixtures/KL130(EU)_1.0_1.8.8.json (100%) rename {kasa/tests => tests}/fixtures/KL130(US)_1.0_1.8.11.json (100%) rename {kasa/tests => tests}/fixtures/KL135(US)_1.0_1.0.15.json (100%) rename {kasa/tests => tests}/fixtures/KL135(US)_1.0_1.0.6.json (100%) rename {kasa/tests => tests}/fixtures/KL400L5(US)_1.0_1.0.5.json (100%) rename {kasa/tests => tests}/fixtures/KL400L5(US)_1.0_1.0.8.json (100%) rename {kasa/tests => tests}/fixtures/KL420L5(US)_1.0_1.0.2.json (100%) rename {kasa/tests => tests}/fixtures/KL430(UN)_2.0_1.0.8.json (100%) rename {kasa/tests => tests}/fixtures/KL430(US)_1.0_1.0.10.json (100%) rename {kasa/tests => tests}/fixtures/KL430(US)_2.0_1.0.11.json (100%) rename {kasa/tests => tests}/fixtures/KL430(US)_2.0_1.0.8.json (100%) rename {kasa/tests => tests}/fixtures/KL430(US)_2.0_1.0.9.json (100%) rename {kasa/tests => tests}/fixtures/KL50(US)_1.0_1.1.13.json (100%) rename {kasa/tests => tests}/fixtures/KL60(UN)_1.0_1.1.4.json (100%) rename {kasa/tests => tests}/fixtures/KL60(US)_1.0_1.1.13.json (100%) rename {kasa/tests => tests}/fixtures/KP100(US)_3.0_1.0.1.json (100%) rename {kasa/tests => tests}/fixtures/KP105(UK)_1.0_1.0.5.json (100%) rename {kasa/tests => tests}/fixtures/KP105(UK)_1.0_1.0.7.json (100%) rename {kasa/tests => tests}/fixtures/KP115(EU)_1.0_1.0.16.json (100%) rename {kasa/tests => tests}/fixtures/KP115(US)_1.0_1.0.17.json (100%) rename {kasa/tests => tests}/fixtures/KP115(US)_1.0_1.0.21.json (100%) rename {kasa/tests => tests}/fixtures/KP125(US)_1.0_1.0.6.json (100%) rename {kasa/tests => tests}/fixtures/KP200(US)_3.0_1.0.3.json (100%) rename {kasa/tests => tests}/fixtures/KP303(UK)_1.0_1.0.3.json (100%) rename {kasa/tests => tests}/fixtures/KP303(US)_2.0_1.0.3.json (100%) rename {kasa/tests => tests}/fixtures/KP303(US)_2.0_1.0.9.json (100%) rename {kasa/tests => tests}/fixtures/KP400(US)_1.0_1.0.10.json (100%) rename {kasa/tests => tests}/fixtures/KP400(US)_2.0_1.0.6.json (100%) rename {kasa/tests => tests}/fixtures/KP400(US)_3.0_1.0.3.json (100%) rename {kasa/tests => tests}/fixtures/KP400(US)_3.0_1.0.4.json (100%) rename {kasa/tests => tests}/fixtures/KP401(US)_1.0_1.0.0.json (100%) rename {kasa/tests => tests}/fixtures/KP405(US)_1.0_1.0.5.json (100%) rename {kasa/tests => tests}/fixtures/KP405(US)_1.0_1.0.6.json (100%) rename {kasa/tests => tests}/fixtures/KS200M(US)_1.0_1.0.10.json (100%) rename {kasa/tests => tests}/fixtures/KS200M(US)_1.0_1.0.11.json (100%) rename {kasa/tests => tests}/fixtures/KS200M(US)_1.0_1.0.12.json (100%) rename {kasa/tests => tests}/fixtures/KS200M(US)_1.0_1.0.8.json (100%) rename {kasa/tests => tests}/fixtures/KS220(US)_1.0_1.0.13.json (100%) rename {kasa/tests => tests}/fixtures/KS220M(US)_1.0_1.0.4.json (100%) rename {kasa/tests => tests}/fixtures/KS230(US)_1.0_1.0.14.json (100%) rename {kasa/tests => tests}/fixtures/LB110(US)_1.0_1.8.11.json (100%) rename {kasa/tests => tests}/fixtures/smart/EP25(US)_2.6_1.0.1.json (100%) rename {kasa/tests => tests}/fixtures/smart/EP25(US)_2.6_1.0.2.json (100%) rename {kasa/tests => tests}/fixtures/smart/EP40M(US)_1.0_1.1.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/H100(EU)_1.0_1.2.3.json (100%) rename {kasa/tests => tests}/fixtures/smart/H100(EU)_1.0_1.5.10.json (100%) rename {kasa/tests => tests}/fixtures/smart/H100(EU)_1.0_1.5.5.json (100%) rename {kasa/tests => tests}/fixtures/smart/HS220(US)_3.26_1.0.1.json (100%) rename {kasa/tests => tests}/fixtures/smart/KH100(EU)_1.0_1.2.3.json (100%) rename {kasa/tests => tests}/fixtures/smart/KH100(EU)_1.0_1.5.12.json (100%) rename {kasa/tests => tests}/fixtures/smart/KH100(UK)_1.0_1.5.6.json (100%) rename {kasa/tests => tests}/fixtures/smart/KP125M(US)_1.0_1.1.3.json (100%) rename {kasa/tests => tests}/fixtures/smart/KP125M(US)_1.0_1.2.3.json (100%) rename {kasa/tests => tests}/fixtures/smart/KS205(US)_1.0_1.0.2.json (100%) rename {kasa/tests => tests}/fixtures/smart/KS205(US)_1.0_1.1.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/KS225(US)_1.0_1.0.2.json (100%) rename {kasa/tests => tests}/fixtures/smart/KS225(US)_1.0_1.1.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/KS240(US)_1.0_1.0.4.json (100%) rename {kasa/tests => tests}/fixtures/smart/KS240(US)_1.0_1.0.5.json (100%) rename {kasa/tests => tests}/fixtures/smart/KS240(US)_1.0_1.0.7.json (100%) rename {kasa/tests => tests}/fixtures/smart/L510B(EU)_3.0_1.0.5.json (100%) rename {kasa/tests => tests}/fixtures/smart/L510E(US)_3.0_1.0.5.json (100%) rename {kasa/tests => tests}/fixtures/smart/L510E(US)_3.0_1.1.2.json (100%) rename {kasa/tests => tests}/fixtures/smart/L530E(EU)_3.0_1.0.6.json (100%) rename {kasa/tests => tests}/fixtures/smart/L530E(EU)_3.0_1.1.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/L530E(EU)_3.0_1.1.6.json (100%) rename {kasa/tests => tests}/fixtures/smart/L530E(US)_2.0_1.1.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/L630(EU)_1.0_1.1.2.json (100%) rename {kasa/tests => tests}/fixtures/smart/L900-10(EU)_1.0_1.0.17.json (100%) rename {kasa/tests => tests}/fixtures/smart/L900-10(US)_1.0_1.0.11.json (100%) rename {kasa/tests => tests}/fixtures/smart/L900-5(EU)_1.0_1.0.17.json (100%) rename {kasa/tests => tests}/fixtures/smart/L900-5(EU)_1.0_1.1.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/L920-5(EU)_1.0_1.0.7.json (100%) rename {kasa/tests => tests}/fixtures/smart/L920-5(EU)_1.0_1.1.3.json (100%) rename {kasa/tests => tests}/fixtures/smart/L920-5(US)_1.0_1.1.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/L920-5(US)_1.0_1.1.3.json (100%) rename {kasa/tests => tests}/fixtures/smart/L930-5(US)_1.0_1.1.2.json (100%) rename {kasa/tests => tests}/fixtures/smart/P100_1.0.0_1.1.3.json (100%) rename {kasa/tests => tests}/fixtures/smart/P100_1.0.0_1.3.7.json (100%) rename {kasa/tests => tests}/fixtures/smart/P100_1.0.0_1.4.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/P110(EU)_1.0_1.0.7.json (100%) rename {kasa/tests => tests}/fixtures/smart/P110(EU)_1.0_1.2.3.json (100%) rename {kasa/tests => tests}/fixtures/smart/P110(UK)_1.0_1.3.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/P115(EU)_1.0_1.2.3.json (100%) rename {kasa/tests => tests}/fixtures/smart/P125M(US)_1.0_1.1.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/P135(US)_1.0_1.0.5.json (100%) rename {kasa/tests => tests}/fixtures/smart/P300(EU)_1.0_1.0.13.json (100%) rename {kasa/tests => tests}/fixtures/smart/P300(EU)_1.0_1.0.15.json (100%) rename {kasa/tests => tests}/fixtures/smart/P300(EU)_1.0_1.0.7.json (100%) rename {kasa/tests => tests}/fixtures/smart/P304M(UK)_1.0_1.0.3.json (100%) rename {kasa/tests => tests}/fixtures/smart/S500D(US)_1.0_1.0.5.json (100%) rename {kasa/tests => tests}/fixtures/smart/S505(US)_1.0_1.0.2.json (100%) rename {kasa/tests => tests}/fixtures/smart/S505D(US)_1.0_1.1.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/TP15(US)_1.0_1.0.3.json (100%) rename {kasa/tests => tests}/fixtures/smart/TP25(US)_1.0_1.0.2.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/KE100(EU)_1.0_2.4.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/KE100(EU)_1.0_2.8.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/KE100(UK)_1.0_2.8.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/S200B(EU)_1.0_1.11.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/S200B(US)_1.0_1.12.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/S200D(EU)_1.0_1.11.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/S200D(EU)_1.0_1.12.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/T100(EU)_1.0_1.12.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/T110(EU)_1.0_1.8.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/T110(EU)_1.0_1.9.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/T110(US)_1.0_1.9.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/T300(EU)_1.0_1.7.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/T310(EU)_1.0_1.5.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/T310(US)_1.0_1.5.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/T315(EU)_1.0_1.7.0.json (100%) rename {kasa/tests => tests}/fixtures/smart/child/T315(US)_1.0_1.8.0.json (100%) rename {kasa/tests => tests}/fixtures/smartcamera/C210(EU)_2.0_1.4.2.json (100%) rename {kasa/tests => tests}/fixtures/smartcamera/C210(EU)_2.0_1.4.3.json (100%) rename {kasa/tests => tests}/fixtures/smartcamera/H200(EU)_1.0_1.3.2.json (100%) rename {kasa/tests => tests}/fixtures/smartcamera/H200(US)_1.0_1.3.6.json (100%) rename {kasa/tests => tests}/fixtures/smartcamera/TC65_1.0_1.3.9.json (100%) rename {kasa/tests/iot/modules => tests/iot}/__init__.py (100%) rename {kasa/tests/smart => tests/iot/modules}/__init__.py (100%) rename {kasa/tests => tests}/iot/modules/test_ambientlight.py (96%) rename {kasa/tests => tests}/iot/modules/test_motion.py (97%) rename {kasa/tests => tests}/iot/test_wallswitch.py (84%) rename {kasa/tests/smart/features => tests/smart}/__init__.py (100%) rename {kasa/tests/smart/modules => tests/smart/features}/__init__.py (100%) rename {kasa/tests => tests}/smart/features/test_brightness.py (95%) rename {kasa/tests => tests}/smart/features/test_colortemp.py (94%) rename {kasa/tests/smartcamera => tests/smart/modules}/__init__.py (100%) rename {kasa/tests => tests}/smart/modules/test_autooff.py (97%) rename {kasa/tests => tests}/smart/modules/test_childprotection.py (95%) rename {kasa/tests => tests}/smart/modules/test_contact.py (92%) rename {kasa/tests => tests}/smart/modules/test_fan.py (96%) rename {kasa/tests => tests}/smart/modules/test_firmware.py (98%) rename {kasa/tests => tests}/smart/modules/test_humidity.py (92%) rename {kasa/tests => tests}/smart/modules/test_light_effect.py (98%) rename {kasa/tests => tests}/smart/modules/test_light_strip_effect.py (98%) rename {kasa/tests => tests}/smart/modules/test_lighttransition.py (95%) rename {kasa/tests => tests}/smart/modules/test_motionsensor.py (92%) rename {kasa/tests => tests}/smart/modules/test_temperature.py (96%) rename {kasa/tests => tests}/smart/modules/test_temperaturecontrol.py (98%) rename {kasa/tests => tests}/smart/modules/test_waterleak.py (96%) create mode 100644 tests/smartcamera/__init__.py rename {kasa/tests => tests}/smartcamera/test_smartcamera.py (100%) rename {kasa/tests => tests}/test_aestransport.py (98%) rename {kasa/tests => tests}/test_bulb.py (100%) rename {kasa/tests => tests}/test_childdevice.py (100%) rename {kasa/tests => tests}/test_cli.py (100%) rename {kasa/tests => tests}/test_common_modules.py (99%) rename {kasa/tests => tests}/test_device.py (100%) rename {kasa/tests => tests}/test_device_factory.py (100%) rename {kasa/tests => tests}/test_device_type.py (100%) rename {kasa/tests => tests}/test_deviceconfig.py (100%) rename {kasa/tests => tests}/test_dimmer.py (100%) rename {kasa/tests => tests}/test_discovery.py (100%) rename {kasa/tests => tests}/test_emeter.py (100%) rename {kasa/tests => tests}/test_feature.py (100%) rename {kasa/tests => tests}/test_httpclient.py (95%) rename {kasa/tests => tests}/test_iotdevice.py (100%) rename {kasa/tests => tests}/test_klapprotocol.py (98%) rename {kasa/tests => tests}/test_lightstrip.py (100%) rename {kasa/tests => tests}/test_plug.py (100%) rename {kasa/tests => tests}/test_protocol.py (98%) rename {kasa/tests => tests}/test_readme_examples.py (99%) rename {kasa/tests => tests}/test_smartdevice.py (100%) rename {kasa/tests => tests}/test_smartprotocol.py (99%) rename {kasa/tests => tests}/test_sslaestransport.py (97%) rename {kasa/tests => tests}/test_strip.py (100%) rename {kasa/tests => tests}/test_usage.py (100%) diff --git a/devtools/dump_devinfo.py b/devtools/dump_devinfo.py index 6d03472ea..5cbfff76f 100644 --- a/devtools/dump_devinfo.py +++ b/devtools/dump_devinfo.py @@ -1,7 +1,7 @@ """This script generates devinfo files for the test suite. If you have new, yet unsupported device or a device with no devinfo file under - kasa/tests/fixtures, feel free to run this script and create a PR to add the file + tests/fixtures, feel free to run this script and create a PR to add the file to the repository. Executing this script will several modules and methods one by one, @@ -50,10 +50,10 @@ Call = namedtuple("Call", "module method") FixtureResult = namedtuple("FixtureResult", "filename, folder, data") -SMART_FOLDER = "kasa/tests/fixtures/smart/" -SMARTCAMERA_FOLDER = "kasa/tests/fixtures/smartcamera/" -SMART_CHILD_FOLDER = "kasa/tests/fixtures/smart/child/" -IOT_FOLDER = "kasa/tests/fixtures/" +SMART_FOLDER = "tests/fixtures/smart/" +SMARTCAMERA_FOLDER = "tests/fixtures/smartcamera/" +SMART_CHILD_FOLDER = "tests/fixtures/smart/child/" +IOT_FOLDER = "tests/fixtures/" ENCRYPT_TYPES = [encrypt_type.value for encrypt_type in DeviceEncryptionType] diff --git a/devtools/generate_supported.py b/devtools/generate_supported.py index b2909149c..43a69455b 100755 --- a/devtools/generate_supported.py +++ b/devtools/generate_supported.py @@ -41,8 +41,8 @@ class SupportedVersion(NamedTuple): SUPPORTED_FILENAME = "SUPPORTED.md" README_FILENAME = "README.md" -IOT_FOLDER = "kasa/tests/fixtures/" -SMART_FOLDER = "kasa/tests/fixtures/smart/" +IOT_FOLDER = "tests/fixtures/" +SMART_FOLDER = "tests/fixtures/smart/" def generate_supported(args): diff --git a/docs/source/contribute.md b/docs/source/contribute.md index e2aae43f8..2f735ce18 100644 --- a/docs/source/contribute.md +++ b/docs/source/contribute.md @@ -59,7 +59,7 @@ One of the easiest ways to contribute is by creating a fixture file and uploadin These files will help us to improve the library and run tests against devices that we have no access to. This library is tested against responses from real devices ("fixture files"). -These files contain responses for selected, known device commands and are stored [in our test suite](https://github.com/python-kasa/python-kasa/tree/master/kasa/tests/fixtures). +These files contain responses for selected, known device commands and are stored [in our test suite](https://github.com/python-kasa/python-kasa/tree/master/tests/fixtures). You can generate these files by using the `dump_devinfo.py` script. Note, that this script should be run inside the main source directory so that the generated files are stored in the correct directories. diff --git a/pyproject.toml b/pyproject.toml index 8374a7117..9db7474c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,15 +78,11 @@ include = [ include = [ "/kasa", ] -exclude = [ - "/kasa/tests", -] [tool.coverage.run] source = ["kasa"] branch = true omit = [ - "kasa/tests/*", "kasa/experimental/*" ] @@ -107,6 +103,9 @@ exclude_lines = [ ] [tool.pytest.ini_options] +testpaths = [ + "tests", +] markers = [ "requires_dummy: test requires dummy data to pass, skipped on real devices", ] @@ -154,7 +153,7 @@ ignore = [ convention = "pep257" [tool.ruff.lint.per-file-ignores] -"kasa/tests/*.py" = [ +"tests/*.py" = [ "D100", "D101", "D102", diff --git a/kasa/tests/__init__.py b/tests/__init__.py similarity index 100% rename from kasa/tests/__init__.py rename to tests/__init__.py diff --git a/kasa/tests/conftest.py b/tests/conftest.py similarity index 100% rename from kasa/tests/conftest.py rename to tests/conftest.py diff --git a/kasa/tests/device_fixtures.py b/tests/device_fixtures.py similarity index 100% rename from kasa/tests/device_fixtures.py rename to tests/device_fixtures.py diff --git a/kasa/tests/discovery_fixtures.py b/tests/discovery_fixtures.py similarity index 100% rename from kasa/tests/discovery_fixtures.py rename to tests/discovery_fixtures.py diff --git a/kasa/tests/fakeprotocol_iot.py b/tests/fakeprotocol_iot.py similarity index 99% rename from kasa/tests/fakeprotocol_iot.py rename to tests/fakeprotocol_iot.py index 36f532359..c8897d9b9 100644 --- a/kasa/tests/fakeprotocol_iot.py +++ b/tests/fakeprotocol_iot.py @@ -1,9 +1,9 @@ import copy import logging -from ..deviceconfig import DeviceConfig -from ..iotprotocol import IotProtocol -from ..protocol import BaseTransport +from kasa.deviceconfig import DeviceConfig +from kasa.iotprotocol import IotProtocol +from kasa.protocol import BaseTransport _LOGGER = logging.getLogger(__name__) diff --git a/kasa/tests/fakeprotocol_smart.py b/tests/fakeprotocol_smart.py similarity index 100% rename from kasa/tests/fakeprotocol_smart.py rename to tests/fakeprotocol_smart.py diff --git a/kasa/tests/fakeprotocol_smartcamera.py b/tests/fakeprotocol_smartcamera.py similarity index 100% rename from kasa/tests/fakeprotocol_smartcamera.py rename to tests/fakeprotocol_smartcamera.py diff --git a/kasa/tests/fixtureinfo.py b/tests/fixtureinfo.py similarity index 100% rename from kasa/tests/fixtureinfo.py rename to tests/fixtureinfo.py diff --git a/kasa/tests/fixtures/EP10(US)_1.0_1.0.2.json b/tests/fixtures/EP10(US)_1.0_1.0.2.json similarity index 100% rename from kasa/tests/fixtures/EP10(US)_1.0_1.0.2.json rename to tests/fixtures/EP10(US)_1.0_1.0.2.json diff --git a/kasa/tests/fixtures/EP40(US)_1.0_1.0.2.json b/tests/fixtures/EP40(US)_1.0_1.0.2.json similarity index 100% rename from kasa/tests/fixtures/EP40(US)_1.0_1.0.2.json rename to tests/fixtures/EP40(US)_1.0_1.0.2.json diff --git a/kasa/tests/fixtures/ES20M(US)_1.0_1.0.11.json b/tests/fixtures/ES20M(US)_1.0_1.0.11.json similarity index 100% rename from kasa/tests/fixtures/ES20M(US)_1.0_1.0.11.json rename to tests/fixtures/ES20M(US)_1.0_1.0.11.json diff --git a/kasa/tests/fixtures/ES20M(US)_1.0_1.0.8.json b/tests/fixtures/ES20M(US)_1.0_1.0.8.json similarity index 100% rename from kasa/tests/fixtures/ES20M(US)_1.0_1.0.8.json rename to tests/fixtures/ES20M(US)_1.0_1.0.8.json diff --git a/kasa/tests/fixtures/HS100(UK)_1.0_1.2.6.json b/tests/fixtures/HS100(UK)_1.0_1.2.6.json similarity index 100% rename from kasa/tests/fixtures/HS100(UK)_1.0_1.2.6.json rename to tests/fixtures/HS100(UK)_1.0_1.2.6.json diff --git a/kasa/tests/fixtures/HS100(UK)_4.1_1.1.0.json b/tests/fixtures/HS100(UK)_4.1_1.1.0.json similarity index 100% rename from kasa/tests/fixtures/HS100(UK)_4.1_1.1.0.json rename to tests/fixtures/HS100(UK)_4.1_1.1.0.json diff --git a/kasa/tests/fixtures/HS100(US)_1.0_1.2.5.json b/tests/fixtures/HS100(US)_1.0_1.2.5.json similarity index 100% rename from kasa/tests/fixtures/HS100(US)_1.0_1.2.5.json rename to tests/fixtures/HS100(US)_1.0_1.2.5.json diff --git a/kasa/tests/fixtures/HS100(US)_2.0_1.5.6.json b/tests/fixtures/HS100(US)_2.0_1.5.6.json similarity index 100% rename from kasa/tests/fixtures/HS100(US)_2.0_1.5.6.json rename to tests/fixtures/HS100(US)_2.0_1.5.6.json diff --git a/kasa/tests/fixtures/HS103(US)_1.0_1.5.7.json b/tests/fixtures/HS103(US)_1.0_1.5.7.json similarity index 100% rename from kasa/tests/fixtures/HS103(US)_1.0_1.5.7.json rename to tests/fixtures/HS103(US)_1.0_1.5.7.json diff --git a/kasa/tests/fixtures/HS103(US)_2.1_1.1.2.json b/tests/fixtures/HS103(US)_2.1_1.1.2.json similarity index 100% rename from kasa/tests/fixtures/HS103(US)_2.1_1.1.2.json rename to tests/fixtures/HS103(US)_2.1_1.1.2.json diff --git a/kasa/tests/fixtures/HS103(US)_2.1_1.1.4.json b/tests/fixtures/HS103(US)_2.1_1.1.4.json similarity index 100% rename from kasa/tests/fixtures/HS103(US)_2.1_1.1.4.json rename to tests/fixtures/HS103(US)_2.1_1.1.4.json diff --git a/kasa/tests/fixtures/HS105(US)_1.0_1.5.6.json b/tests/fixtures/HS105(US)_1.0_1.5.6.json similarity index 100% rename from kasa/tests/fixtures/HS105(US)_1.0_1.5.6.json rename to tests/fixtures/HS105(US)_1.0_1.5.6.json diff --git a/kasa/tests/fixtures/HS107(US)_1.0_1.0.8.json b/tests/fixtures/HS107(US)_1.0_1.0.8.json similarity index 100% rename from kasa/tests/fixtures/HS107(US)_1.0_1.0.8.json rename to tests/fixtures/HS107(US)_1.0_1.0.8.json diff --git a/kasa/tests/fixtures/HS110(EU)_1.0_1.2.5.json b/tests/fixtures/HS110(EU)_1.0_1.2.5.json similarity index 100% rename from kasa/tests/fixtures/HS110(EU)_1.0_1.2.5.json rename to tests/fixtures/HS110(EU)_1.0_1.2.5.json diff --git a/kasa/tests/fixtures/HS110(EU)_4.0_1.0.4.json b/tests/fixtures/HS110(EU)_4.0_1.0.4.json similarity index 100% rename from kasa/tests/fixtures/HS110(EU)_4.0_1.0.4.json rename to tests/fixtures/HS110(EU)_4.0_1.0.4.json diff --git a/kasa/tests/fixtures/HS110(US)_1.0_1.2.6.json b/tests/fixtures/HS110(US)_1.0_1.2.6.json similarity index 100% rename from kasa/tests/fixtures/HS110(US)_1.0_1.2.6.json rename to tests/fixtures/HS110(US)_1.0_1.2.6.json diff --git a/kasa/tests/fixtures/HS200(US)_2.0_1.5.7.json b/tests/fixtures/HS200(US)_2.0_1.5.7.json similarity index 100% rename from kasa/tests/fixtures/HS200(US)_2.0_1.5.7.json rename to tests/fixtures/HS200(US)_2.0_1.5.7.json diff --git a/kasa/tests/fixtures/HS200(US)_3.0_1.1.5.json b/tests/fixtures/HS200(US)_3.0_1.1.5.json similarity index 100% rename from kasa/tests/fixtures/HS200(US)_3.0_1.1.5.json rename to tests/fixtures/HS200(US)_3.0_1.1.5.json diff --git a/kasa/tests/fixtures/HS200(US)_5.0_1.0.11.json b/tests/fixtures/HS200(US)_5.0_1.0.11.json similarity index 100% rename from kasa/tests/fixtures/HS200(US)_5.0_1.0.11.json rename to tests/fixtures/HS200(US)_5.0_1.0.11.json diff --git a/kasa/tests/fixtures/HS200(US)_5.0_1.0.2.json b/tests/fixtures/HS200(US)_5.0_1.0.2.json similarity index 100% rename from kasa/tests/fixtures/HS200(US)_5.0_1.0.2.json rename to tests/fixtures/HS200(US)_5.0_1.0.2.json diff --git a/kasa/tests/fixtures/HS210(US)_1.0_1.5.8.json b/tests/fixtures/HS210(US)_1.0_1.5.8.json similarity index 100% rename from kasa/tests/fixtures/HS210(US)_1.0_1.5.8.json rename to tests/fixtures/HS210(US)_1.0_1.5.8.json diff --git a/kasa/tests/fixtures/HS210(US)_2.0_1.1.5.json b/tests/fixtures/HS210(US)_2.0_1.1.5.json similarity index 100% rename from kasa/tests/fixtures/HS210(US)_2.0_1.1.5.json rename to tests/fixtures/HS210(US)_2.0_1.1.5.json diff --git a/kasa/tests/fixtures/HS220(US)_1.0_1.5.7.json b/tests/fixtures/HS220(US)_1.0_1.5.7.json similarity index 100% rename from kasa/tests/fixtures/HS220(US)_1.0_1.5.7.json rename to tests/fixtures/HS220(US)_1.0_1.5.7.json diff --git a/kasa/tests/fixtures/HS220(US)_2.0_1.0.3.json b/tests/fixtures/HS220(US)_2.0_1.0.3.json similarity index 100% rename from kasa/tests/fixtures/HS220(US)_2.0_1.0.3.json rename to tests/fixtures/HS220(US)_2.0_1.0.3.json diff --git a/kasa/tests/fixtures/HS300(US)_1.0_1.0.10.json b/tests/fixtures/HS300(US)_1.0_1.0.10.json similarity index 100% rename from kasa/tests/fixtures/HS300(US)_1.0_1.0.10.json rename to tests/fixtures/HS300(US)_1.0_1.0.10.json diff --git a/kasa/tests/fixtures/HS300(US)_1.0_1.0.21.json b/tests/fixtures/HS300(US)_1.0_1.0.21.json similarity index 100% rename from kasa/tests/fixtures/HS300(US)_1.0_1.0.21.json rename to tests/fixtures/HS300(US)_1.0_1.0.21.json diff --git a/kasa/tests/fixtures/HS300(US)_2.0_1.0.12.json b/tests/fixtures/HS300(US)_2.0_1.0.12.json similarity index 100% rename from kasa/tests/fixtures/HS300(US)_2.0_1.0.12.json rename to tests/fixtures/HS300(US)_2.0_1.0.12.json diff --git a/kasa/tests/fixtures/HS300(US)_2.0_1.0.3.json b/tests/fixtures/HS300(US)_2.0_1.0.3.json similarity index 100% rename from kasa/tests/fixtures/HS300(US)_2.0_1.0.3.json rename to tests/fixtures/HS300(US)_2.0_1.0.3.json diff --git a/kasa/tests/fixtures/KL110(US)_1.0_1.8.11.json b/tests/fixtures/KL110(US)_1.0_1.8.11.json similarity index 100% rename from kasa/tests/fixtures/KL110(US)_1.0_1.8.11.json rename to tests/fixtures/KL110(US)_1.0_1.8.11.json diff --git a/kasa/tests/fixtures/KL120(US)_1.0_1.8.11.json b/tests/fixtures/KL120(US)_1.0_1.8.11.json similarity index 100% rename from kasa/tests/fixtures/KL120(US)_1.0_1.8.11.json rename to tests/fixtures/KL120(US)_1.0_1.8.11.json diff --git a/kasa/tests/fixtures/KL120(US)_1.0_1.8.6.json b/tests/fixtures/KL120(US)_1.0_1.8.6.json similarity index 100% rename from kasa/tests/fixtures/KL120(US)_1.0_1.8.6.json rename to tests/fixtures/KL120(US)_1.0_1.8.6.json diff --git a/kasa/tests/fixtures/KL125(US)_1.20_1.0.5.json b/tests/fixtures/KL125(US)_1.20_1.0.5.json similarity index 100% rename from kasa/tests/fixtures/KL125(US)_1.20_1.0.5.json rename to tests/fixtures/KL125(US)_1.20_1.0.5.json diff --git a/kasa/tests/fixtures/KL125(US)_2.0_1.0.7.json b/tests/fixtures/KL125(US)_2.0_1.0.7.json similarity index 100% rename from kasa/tests/fixtures/KL125(US)_2.0_1.0.7.json rename to tests/fixtures/KL125(US)_2.0_1.0.7.json diff --git a/kasa/tests/fixtures/KL125(US)_4.0_1.0.5.json b/tests/fixtures/KL125(US)_4.0_1.0.5.json similarity index 100% rename from kasa/tests/fixtures/KL125(US)_4.0_1.0.5.json rename to tests/fixtures/KL125(US)_4.0_1.0.5.json diff --git a/kasa/tests/fixtures/KL130(EU)_1.0_1.8.8.json b/tests/fixtures/KL130(EU)_1.0_1.8.8.json similarity index 100% rename from kasa/tests/fixtures/KL130(EU)_1.0_1.8.8.json rename to tests/fixtures/KL130(EU)_1.0_1.8.8.json diff --git a/kasa/tests/fixtures/KL130(US)_1.0_1.8.11.json b/tests/fixtures/KL130(US)_1.0_1.8.11.json similarity index 100% rename from kasa/tests/fixtures/KL130(US)_1.0_1.8.11.json rename to tests/fixtures/KL130(US)_1.0_1.8.11.json diff --git a/kasa/tests/fixtures/KL135(US)_1.0_1.0.15.json b/tests/fixtures/KL135(US)_1.0_1.0.15.json similarity index 100% rename from kasa/tests/fixtures/KL135(US)_1.0_1.0.15.json rename to tests/fixtures/KL135(US)_1.0_1.0.15.json diff --git a/kasa/tests/fixtures/KL135(US)_1.0_1.0.6.json b/tests/fixtures/KL135(US)_1.0_1.0.6.json similarity index 100% rename from kasa/tests/fixtures/KL135(US)_1.0_1.0.6.json rename to tests/fixtures/KL135(US)_1.0_1.0.6.json diff --git a/kasa/tests/fixtures/KL400L5(US)_1.0_1.0.5.json b/tests/fixtures/KL400L5(US)_1.0_1.0.5.json similarity index 100% rename from kasa/tests/fixtures/KL400L5(US)_1.0_1.0.5.json rename to tests/fixtures/KL400L5(US)_1.0_1.0.5.json diff --git a/kasa/tests/fixtures/KL400L5(US)_1.0_1.0.8.json b/tests/fixtures/KL400L5(US)_1.0_1.0.8.json similarity index 100% rename from kasa/tests/fixtures/KL400L5(US)_1.0_1.0.8.json rename to tests/fixtures/KL400L5(US)_1.0_1.0.8.json diff --git a/kasa/tests/fixtures/KL420L5(US)_1.0_1.0.2.json b/tests/fixtures/KL420L5(US)_1.0_1.0.2.json similarity index 100% rename from kasa/tests/fixtures/KL420L5(US)_1.0_1.0.2.json rename to tests/fixtures/KL420L5(US)_1.0_1.0.2.json diff --git a/kasa/tests/fixtures/KL430(UN)_2.0_1.0.8.json b/tests/fixtures/KL430(UN)_2.0_1.0.8.json similarity index 100% rename from kasa/tests/fixtures/KL430(UN)_2.0_1.0.8.json rename to tests/fixtures/KL430(UN)_2.0_1.0.8.json diff --git a/kasa/tests/fixtures/KL430(US)_1.0_1.0.10.json b/tests/fixtures/KL430(US)_1.0_1.0.10.json similarity index 100% rename from kasa/tests/fixtures/KL430(US)_1.0_1.0.10.json rename to tests/fixtures/KL430(US)_1.0_1.0.10.json diff --git a/kasa/tests/fixtures/KL430(US)_2.0_1.0.11.json b/tests/fixtures/KL430(US)_2.0_1.0.11.json similarity index 100% rename from kasa/tests/fixtures/KL430(US)_2.0_1.0.11.json rename to tests/fixtures/KL430(US)_2.0_1.0.11.json diff --git a/kasa/tests/fixtures/KL430(US)_2.0_1.0.8.json b/tests/fixtures/KL430(US)_2.0_1.0.8.json similarity index 100% rename from kasa/tests/fixtures/KL430(US)_2.0_1.0.8.json rename to tests/fixtures/KL430(US)_2.0_1.0.8.json diff --git a/kasa/tests/fixtures/KL430(US)_2.0_1.0.9.json b/tests/fixtures/KL430(US)_2.0_1.0.9.json similarity index 100% rename from kasa/tests/fixtures/KL430(US)_2.0_1.0.9.json rename to tests/fixtures/KL430(US)_2.0_1.0.9.json diff --git a/kasa/tests/fixtures/KL50(US)_1.0_1.1.13.json b/tests/fixtures/KL50(US)_1.0_1.1.13.json similarity index 100% rename from kasa/tests/fixtures/KL50(US)_1.0_1.1.13.json rename to tests/fixtures/KL50(US)_1.0_1.1.13.json diff --git a/kasa/tests/fixtures/KL60(UN)_1.0_1.1.4.json b/tests/fixtures/KL60(UN)_1.0_1.1.4.json similarity index 100% rename from kasa/tests/fixtures/KL60(UN)_1.0_1.1.4.json rename to tests/fixtures/KL60(UN)_1.0_1.1.4.json diff --git a/kasa/tests/fixtures/KL60(US)_1.0_1.1.13.json b/tests/fixtures/KL60(US)_1.0_1.1.13.json similarity index 100% rename from kasa/tests/fixtures/KL60(US)_1.0_1.1.13.json rename to tests/fixtures/KL60(US)_1.0_1.1.13.json diff --git a/kasa/tests/fixtures/KP100(US)_3.0_1.0.1.json b/tests/fixtures/KP100(US)_3.0_1.0.1.json similarity index 100% rename from kasa/tests/fixtures/KP100(US)_3.0_1.0.1.json rename to tests/fixtures/KP100(US)_3.0_1.0.1.json diff --git a/kasa/tests/fixtures/KP105(UK)_1.0_1.0.5.json b/tests/fixtures/KP105(UK)_1.0_1.0.5.json similarity index 100% rename from kasa/tests/fixtures/KP105(UK)_1.0_1.0.5.json rename to tests/fixtures/KP105(UK)_1.0_1.0.5.json diff --git a/kasa/tests/fixtures/KP105(UK)_1.0_1.0.7.json b/tests/fixtures/KP105(UK)_1.0_1.0.7.json similarity index 100% rename from kasa/tests/fixtures/KP105(UK)_1.0_1.0.7.json rename to tests/fixtures/KP105(UK)_1.0_1.0.7.json diff --git a/kasa/tests/fixtures/KP115(EU)_1.0_1.0.16.json b/tests/fixtures/KP115(EU)_1.0_1.0.16.json similarity index 100% rename from kasa/tests/fixtures/KP115(EU)_1.0_1.0.16.json rename to tests/fixtures/KP115(EU)_1.0_1.0.16.json diff --git a/kasa/tests/fixtures/KP115(US)_1.0_1.0.17.json b/tests/fixtures/KP115(US)_1.0_1.0.17.json similarity index 100% rename from kasa/tests/fixtures/KP115(US)_1.0_1.0.17.json rename to tests/fixtures/KP115(US)_1.0_1.0.17.json diff --git a/kasa/tests/fixtures/KP115(US)_1.0_1.0.21.json b/tests/fixtures/KP115(US)_1.0_1.0.21.json similarity index 100% rename from kasa/tests/fixtures/KP115(US)_1.0_1.0.21.json rename to tests/fixtures/KP115(US)_1.0_1.0.21.json diff --git a/kasa/tests/fixtures/KP125(US)_1.0_1.0.6.json b/tests/fixtures/KP125(US)_1.0_1.0.6.json similarity index 100% rename from kasa/tests/fixtures/KP125(US)_1.0_1.0.6.json rename to tests/fixtures/KP125(US)_1.0_1.0.6.json diff --git a/kasa/tests/fixtures/KP200(US)_3.0_1.0.3.json b/tests/fixtures/KP200(US)_3.0_1.0.3.json similarity index 100% rename from kasa/tests/fixtures/KP200(US)_3.0_1.0.3.json rename to tests/fixtures/KP200(US)_3.0_1.0.3.json diff --git a/kasa/tests/fixtures/KP303(UK)_1.0_1.0.3.json b/tests/fixtures/KP303(UK)_1.0_1.0.3.json similarity index 100% rename from kasa/tests/fixtures/KP303(UK)_1.0_1.0.3.json rename to tests/fixtures/KP303(UK)_1.0_1.0.3.json diff --git a/kasa/tests/fixtures/KP303(US)_2.0_1.0.3.json b/tests/fixtures/KP303(US)_2.0_1.0.3.json similarity index 100% rename from kasa/tests/fixtures/KP303(US)_2.0_1.0.3.json rename to tests/fixtures/KP303(US)_2.0_1.0.3.json diff --git a/kasa/tests/fixtures/KP303(US)_2.0_1.0.9.json b/tests/fixtures/KP303(US)_2.0_1.0.9.json similarity index 100% rename from kasa/tests/fixtures/KP303(US)_2.0_1.0.9.json rename to tests/fixtures/KP303(US)_2.0_1.0.9.json diff --git a/kasa/tests/fixtures/KP400(US)_1.0_1.0.10.json b/tests/fixtures/KP400(US)_1.0_1.0.10.json similarity index 100% rename from kasa/tests/fixtures/KP400(US)_1.0_1.0.10.json rename to tests/fixtures/KP400(US)_1.0_1.0.10.json diff --git a/kasa/tests/fixtures/KP400(US)_2.0_1.0.6.json b/tests/fixtures/KP400(US)_2.0_1.0.6.json similarity index 100% rename from kasa/tests/fixtures/KP400(US)_2.0_1.0.6.json rename to tests/fixtures/KP400(US)_2.0_1.0.6.json diff --git a/kasa/tests/fixtures/KP400(US)_3.0_1.0.3.json b/tests/fixtures/KP400(US)_3.0_1.0.3.json similarity index 100% rename from kasa/tests/fixtures/KP400(US)_3.0_1.0.3.json rename to tests/fixtures/KP400(US)_3.0_1.0.3.json diff --git a/kasa/tests/fixtures/KP400(US)_3.0_1.0.4.json b/tests/fixtures/KP400(US)_3.0_1.0.4.json similarity index 100% rename from kasa/tests/fixtures/KP400(US)_3.0_1.0.4.json rename to tests/fixtures/KP400(US)_3.0_1.0.4.json diff --git a/kasa/tests/fixtures/KP401(US)_1.0_1.0.0.json b/tests/fixtures/KP401(US)_1.0_1.0.0.json similarity index 100% rename from kasa/tests/fixtures/KP401(US)_1.0_1.0.0.json rename to tests/fixtures/KP401(US)_1.0_1.0.0.json diff --git a/kasa/tests/fixtures/KP405(US)_1.0_1.0.5.json b/tests/fixtures/KP405(US)_1.0_1.0.5.json similarity index 100% rename from kasa/tests/fixtures/KP405(US)_1.0_1.0.5.json rename to tests/fixtures/KP405(US)_1.0_1.0.5.json diff --git a/kasa/tests/fixtures/KP405(US)_1.0_1.0.6.json b/tests/fixtures/KP405(US)_1.0_1.0.6.json similarity index 100% rename from kasa/tests/fixtures/KP405(US)_1.0_1.0.6.json rename to tests/fixtures/KP405(US)_1.0_1.0.6.json diff --git a/kasa/tests/fixtures/KS200M(US)_1.0_1.0.10.json b/tests/fixtures/KS200M(US)_1.0_1.0.10.json similarity index 100% rename from kasa/tests/fixtures/KS200M(US)_1.0_1.0.10.json rename to tests/fixtures/KS200M(US)_1.0_1.0.10.json diff --git a/kasa/tests/fixtures/KS200M(US)_1.0_1.0.11.json b/tests/fixtures/KS200M(US)_1.0_1.0.11.json similarity index 100% rename from kasa/tests/fixtures/KS200M(US)_1.0_1.0.11.json rename to tests/fixtures/KS200M(US)_1.0_1.0.11.json diff --git a/kasa/tests/fixtures/KS200M(US)_1.0_1.0.12.json b/tests/fixtures/KS200M(US)_1.0_1.0.12.json similarity index 100% rename from kasa/tests/fixtures/KS200M(US)_1.0_1.0.12.json rename to tests/fixtures/KS200M(US)_1.0_1.0.12.json diff --git a/kasa/tests/fixtures/KS200M(US)_1.0_1.0.8.json b/tests/fixtures/KS200M(US)_1.0_1.0.8.json similarity index 100% rename from kasa/tests/fixtures/KS200M(US)_1.0_1.0.8.json rename to tests/fixtures/KS200M(US)_1.0_1.0.8.json diff --git a/kasa/tests/fixtures/KS220(US)_1.0_1.0.13.json b/tests/fixtures/KS220(US)_1.0_1.0.13.json similarity index 100% rename from kasa/tests/fixtures/KS220(US)_1.0_1.0.13.json rename to tests/fixtures/KS220(US)_1.0_1.0.13.json diff --git a/kasa/tests/fixtures/KS220M(US)_1.0_1.0.4.json b/tests/fixtures/KS220M(US)_1.0_1.0.4.json similarity index 100% rename from kasa/tests/fixtures/KS220M(US)_1.0_1.0.4.json rename to tests/fixtures/KS220M(US)_1.0_1.0.4.json diff --git a/kasa/tests/fixtures/KS230(US)_1.0_1.0.14.json b/tests/fixtures/KS230(US)_1.0_1.0.14.json similarity index 100% rename from kasa/tests/fixtures/KS230(US)_1.0_1.0.14.json rename to tests/fixtures/KS230(US)_1.0_1.0.14.json diff --git a/kasa/tests/fixtures/LB110(US)_1.0_1.8.11.json b/tests/fixtures/LB110(US)_1.0_1.8.11.json similarity index 100% rename from kasa/tests/fixtures/LB110(US)_1.0_1.8.11.json rename to tests/fixtures/LB110(US)_1.0_1.8.11.json diff --git a/kasa/tests/fixtures/smart/EP25(US)_2.6_1.0.1.json b/tests/fixtures/smart/EP25(US)_2.6_1.0.1.json similarity index 100% rename from kasa/tests/fixtures/smart/EP25(US)_2.6_1.0.1.json rename to tests/fixtures/smart/EP25(US)_2.6_1.0.1.json diff --git a/kasa/tests/fixtures/smart/EP25(US)_2.6_1.0.2.json b/tests/fixtures/smart/EP25(US)_2.6_1.0.2.json similarity index 100% rename from kasa/tests/fixtures/smart/EP25(US)_2.6_1.0.2.json rename to tests/fixtures/smart/EP25(US)_2.6_1.0.2.json diff --git a/kasa/tests/fixtures/smart/EP40M(US)_1.0_1.1.0.json b/tests/fixtures/smart/EP40M(US)_1.0_1.1.0.json similarity index 100% rename from kasa/tests/fixtures/smart/EP40M(US)_1.0_1.1.0.json rename to tests/fixtures/smart/EP40M(US)_1.0_1.1.0.json diff --git a/kasa/tests/fixtures/smart/H100(EU)_1.0_1.2.3.json b/tests/fixtures/smart/H100(EU)_1.0_1.2.3.json similarity index 100% rename from kasa/tests/fixtures/smart/H100(EU)_1.0_1.2.3.json rename to tests/fixtures/smart/H100(EU)_1.0_1.2.3.json diff --git a/kasa/tests/fixtures/smart/H100(EU)_1.0_1.5.10.json b/tests/fixtures/smart/H100(EU)_1.0_1.5.10.json similarity index 100% rename from kasa/tests/fixtures/smart/H100(EU)_1.0_1.5.10.json rename to tests/fixtures/smart/H100(EU)_1.0_1.5.10.json diff --git a/kasa/tests/fixtures/smart/H100(EU)_1.0_1.5.5.json b/tests/fixtures/smart/H100(EU)_1.0_1.5.5.json similarity index 100% rename from kasa/tests/fixtures/smart/H100(EU)_1.0_1.5.5.json rename to tests/fixtures/smart/H100(EU)_1.0_1.5.5.json diff --git a/kasa/tests/fixtures/smart/HS220(US)_3.26_1.0.1.json b/tests/fixtures/smart/HS220(US)_3.26_1.0.1.json similarity index 100% rename from kasa/tests/fixtures/smart/HS220(US)_3.26_1.0.1.json rename to tests/fixtures/smart/HS220(US)_3.26_1.0.1.json diff --git a/kasa/tests/fixtures/smart/KH100(EU)_1.0_1.2.3.json b/tests/fixtures/smart/KH100(EU)_1.0_1.2.3.json similarity index 100% rename from kasa/tests/fixtures/smart/KH100(EU)_1.0_1.2.3.json rename to tests/fixtures/smart/KH100(EU)_1.0_1.2.3.json diff --git a/kasa/tests/fixtures/smart/KH100(EU)_1.0_1.5.12.json b/tests/fixtures/smart/KH100(EU)_1.0_1.5.12.json similarity index 100% rename from kasa/tests/fixtures/smart/KH100(EU)_1.0_1.5.12.json rename to tests/fixtures/smart/KH100(EU)_1.0_1.5.12.json diff --git a/kasa/tests/fixtures/smart/KH100(UK)_1.0_1.5.6.json b/tests/fixtures/smart/KH100(UK)_1.0_1.5.6.json similarity index 100% rename from kasa/tests/fixtures/smart/KH100(UK)_1.0_1.5.6.json rename to tests/fixtures/smart/KH100(UK)_1.0_1.5.6.json diff --git a/kasa/tests/fixtures/smart/KP125M(US)_1.0_1.1.3.json b/tests/fixtures/smart/KP125M(US)_1.0_1.1.3.json similarity index 100% rename from kasa/tests/fixtures/smart/KP125M(US)_1.0_1.1.3.json rename to tests/fixtures/smart/KP125M(US)_1.0_1.1.3.json diff --git a/kasa/tests/fixtures/smart/KP125M(US)_1.0_1.2.3.json b/tests/fixtures/smart/KP125M(US)_1.0_1.2.3.json similarity index 100% rename from kasa/tests/fixtures/smart/KP125M(US)_1.0_1.2.3.json rename to tests/fixtures/smart/KP125M(US)_1.0_1.2.3.json diff --git a/kasa/tests/fixtures/smart/KS205(US)_1.0_1.0.2.json b/tests/fixtures/smart/KS205(US)_1.0_1.0.2.json similarity index 100% rename from kasa/tests/fixtures/smart/KS205(US)_1.0_1.0.2.json rename to tests/fixtures/smart/KS205(US)_1.0_1.0.2.json diff --git a/kasa/tests/fixtures/smart/KS205(US)_1.0_1.1.0.json b/tests/fixtures/smart/KS205(US)_1.0_1.1.0.json similarity index 100% rename from kasa/tests/fixtures/smart/KS205(US)_1.0_1.1.0.json rename to tests/fixtures/smart/KS205(US)_1.0_1.1.0.json diff --git a/kasa/tests/fixtures/smart/KS225(US)_1.0_1.0.2.json b/tests/fixtures/smart/KS225(US)_1.0_1.0.2.json similarity index 100% rename from kasa/tests/fixtures/smart/KS225(US)_1.0_1.0.2.json rename to tests/fixtures/smart/KS225(US)_1.0_1.0.2.json diff --git a/kasa/tests/fixtures/smart/KS225(US)_1.0_1.1.0.json b/tests/fixtures/smart/KS225(US)_1.0_1.1.0.json similarity index 100% rename from kasa/tests/fixtures/smart/KS225(US)_1.0_1.1.0.json rename to tests/fixtures/smart/KS225(US)_1.0_1.1.0.json diff --git a/kasa/tests/fixtures/smart/KS240(US)_1.0_1.0.4.json b/tests/fixtures/smart/KS240(US)_1.0_1.0.4.json similarity index 100% rename from kasa/tests/fixtures/smart/KS240(US)_1.0_1.0.4.json rename to tests/fixtures/smart/KS240(US)_1.0_1.0.4.json diff --git a/kasa/tests/fixtures/smart/KS240(US)_1.0_1.0.5.json b/tests/fixtures/smart/KS240(US)_1.0_1.0.5.json similarity index 100% rename from kasa/tests/fixtures/smart/KS240(US)_1.0_1.0.5.json rename to tests/fixtures/smart/KS240(US)_1.0_1.0.5.json diff --git a/kasa/tests/fixtures/smart/KS240(US)_1.0_1.0.7.json b/tests/fixtures/smart/KS240(US)_1.0_1.0.7.json similarity index 100% rename from kasa/tests/fixtures/smart/KS240(US)_1.0_1.0.7.json rename to tests/fixtures/smart/KS240(US)_1.0_1.0.7.json diff --git a/kasa/tests/fixtures/smart/L510B(EU)_3.0_1.0.5.json b/tests/fixtures/smart/L510B(EU)_3.0_1.0.5.json similarity index 100% rename from kasa/tests/fixtures/smart/L510B(EU)_3.0_1.0.5.json rename to tests/fixtures/smart/L510B(EU)_3.0_1.0.5.json diff --git a/kasa/tests/fixtures/smart/L510E(US)_3.0_1.0.5.json b/tests/fixtures/smart/L510E(US)_3.0_1.0.5.json similarity index 100% rename from kasa/tests/fixtures/smart/L510E(US)_3.0_1.0.5.json rename to tests/fixtures/smart/L510E(US)_3.0_1.0.5.json diff --git a/kasa/tests/fixtures/smart/L510E(US)_3.0_1.1.2.json b/tests/fixtures/smart/L510E(US)_3.0_1.1.2.json similarity index 100% rename from kasa/tests/fixtures/smart/L510E(US)_3.0_1.1.2.json rename to tests/fixtures/smart/L510E(US)_3.0_1.1.2.json diff --git a/kasa/tests/fixtures/smart/L530E(EU)_3.0_1.0.6.json b/tests/fixtures/smart/L530E(EU)_3.0_1.0.6.json similarity index 100% rename from kasa/tests/fixtures/smart/L530E(EU)_3.0_1.0.6.json rename to tests/fixtures/smart/L530E(EU)_3.0_1.0.6.json diff --git a/kasa/tests/fixtures/smart/L530E(EU)_3.0_1.1.0.json b/tests/fixtures/smart/L530E(EU)_3.0_1.1.0.json similarity index 100% rename from kasa/tests/fixtures/smart/L530E(EU)_3.0_1.1.0.json rename to tests/fixtures/smart/L530E(EU)_3.0_1.1.0.json diff --git a/kasa/tests/fixtures/smart/L530E(EU)_3.0_1.1.6.json b/tests/fixtures/smart/L530E(EU)_3.0_1.1.6.json similarity index 100% rename from kasa/tests/fixtures/smart/L530E(EU)_3.0_1.1.6.json rename to tests/fixtures/smart/L530E(EU)_3.0_1.1.6.json diff --git a/kasa/tests/fixtures/smart/L530E(US)_2.0_1.1.0.json b/tests/fixtures/smart/L530E(US)_2.0_1.1.0.json similarity index 100% rename from kasa/tests/fixtures/smart/L530E(US)_2.0_1.1.0.json rename to tests/fixtures/smart/L530E(US)_2.0_1.1.0.json diff --git a/kasa/tests/fixtures/smart/L630(EU)_1.0_1.1.2.json b/tests/fixtures/smart/L630(EU)_1.0_1.1.2.json similarity index 100% rename from kasa/tests/fixtures/smart/L630(EU)_1.0_1.1.2.json rename to tests/fixtures/smart/L630(EU)_1.0_1.1.2.json diff --git a/kasa/tests/fixtures/smart/L900-10(EU)_1.0_1.0.17.json b/tests/fixtures/smart/L900-10(EU)_1.0_1.0.17.json similarity index 100% rename from kasa/tests/fixtures/smart/L900-10(EU)_1.0_1.0.17.json rename to tests/fixtures/smart/L900-10(EU)_1.0_1.0.17.json diff --git a/kasa/tests/fixtures/smart/L900-10(US)_1.0_1.0.11.json b/tests/fixtures/smart/L900-10(US)_1.0_1.0.11.json similarity index 100% rename from kasa/tests/fixtures/smart/L900-10(US)_1.0_1.0.11.json rename to tests/fixtures/smart/L900-10(US)_1.0_1.0.11.json diff --git a/kasa/tests/fixtures/smart/L900-5(EU)_1.0_1.0.17.json b/tests/fixtures/smart/L900-5(EU)_1.0_1.0.17.json similarity index 100% rename from kasa/tests/fixtures/smart/L900-5(EU)_1.0_1.0.17.json rename to tests/fixtures/smart/L900-5(EU)_1.0_1.0.17.json diff --git a/kasa/tests/fixtures/smart/L900-5(EU)_1.0_1.1.0.json b/tests/fixtures/smart/L900-5(EU)_1.0_1.1.0.json similarity index 100% rename from kasa/tests/fixtures/smart/L900-5(EU)_1.0_1.1.0.json rename to tests/fixtures/smart/L900-5(EU)_1.0_1.1.0.json diff --git a/kasa/tests/fixtures/smart/L920-5(EU)_1.0_1.0.7.json b/tests/fixtures/smart/L920-5(EU)_1.0_1.0.7.json similarity index 100% rename from kasa/tests/fixtures/smart/L920-5(EU)_1.0_1.0.7.json rename to tests/fixtures/smart/L920-5(EU)_1.0_1.0.7.json diff --git a/kasa/tests/fixtures/smart/L920-5(EU)_1.0_1.1.3.json b/tests/fixtures/smart/L920-5(EU)_1.0_1.1.3.json similarity index 100% rename from kasa/tests/fixtures/smart/L920-5(EU)_1.0_1.1.3.json rename to tests/fixtures/smart/L920-5(EU)_1.0_1.1.3.json diff --git a/kasa/tests/fixtures/smart/L920-5(US)_1.0_1.1.0.json b/tests/fixtures/smart/L920-5(US)_1.0_1.1.0.json similarity index 100% rename from kasa/tests/fixtures/smart/L920-5(US)_1.0_1.1.0.json rename to tests/fixtures/smart/L920-5(US)_1.0_1.1.0.json diff --git a/kasa/tests/fixtures/smart/L920-5(US)_1.0_1.1.3.json b/tests/fixtures/smart/L920-5(US)_1.0_1.1.3.json similarity index 100% rename from kasa/tests/fixtures/smart/L920-5(US)_1.0_1.1.3.json rename to tests/fixtures/smart/L920-5(US)_1.0_1.1.3.json diff --git a/kasa/tests/fixtures/smart/L930-5(US)_1.0_1.1.2.json b/tests/fixtures/smart/L930-5(US)_1.0_1.1.2.json similarity index 100% rename from kasa/tests/fixtures/smart/L930-5(US)_1.0_1.1.2.json rename to tests/fixtures/smart/L930-5(US)_1.0_1.1.2.json diff --git a/kasa/tests/fixtures/smart/P100_1.0.0_1.1.3.json b/tests/fixtures/smart/P100_1.0.0_1.1.3.json similarity index 100% rename from kasa/tests/fixtures/smart/P100_1.0.0_1.1.3.json rename to tests/fixtures/smart/P100_1.0.0_1.1.3.json diff --git a/kasa/tests/fixtures/smart/P100_1.0.0_1.3.7.json b/tests/fixtures/smart/P100_1.0.0_1.3.7.json similarity index 100% rename from kasa/tests/fixtures/smart/P100_1.0.0_1.3.7.json rename to tests/fixtures/smart/P100_1.0.0_1.3.7.json diff --git a/kasa/tests/fixtures/smart/P100_1.0.0_1.4.0.json b/tests/fixtures/smart/P100_1.0.0_1.4.0.json similarity index 100% rename from kasa/tests/fixtures/smart/P100_1.0.0_1.4.0.json rename to tests/fixtures/smart/P100_1.0.0_1.4.0.json diff --git a/kasa/tests/fixtures/smart/P110(EU)_1.0_1.0.7.json b/tests/fixtures/smart/P110(EU)_1.0_1.0.7.json similarity index 100% rename from kasa/tests/fixtures/smart/P110(EU)_1.0_1.0.7.json rename to tests/fixtures/smart/P110(EU)_1.0_1.0.7.json diff --git a/kasa/tests/fixtures/smart/P110(EU)_1.0_1.2.3.json b/tests/fixtures/smart/P110(EU)_1.0_1.2.3.json similarity index 100% rename from kasa/tests/fixtures/smart/P110(EU)_1.0_1.2.3.json rename to tests/fixtures/smart/P110(EU)_1.0_1.2.3.json diff --git a/kasa/tests/fixtures/smart/P110(UK)_1.0_1.3.0.json b/tests/fixtures/smart/P110(UK)_1.0_1.3.0.json similarity index 100% rename from kasa/tests/fixtures/smart/P110(UK)_1.0_1.3.0.json rename to tests/fixtures/smart/P110(UK)_1.0_1.3.0.json diff --git a/kasa/tests/fixtures/smart/P115(EU)_1.0_1.2.3.json b/tests/fixtures/smart/P115(EU)_1.0_1.2.3.json similarity index 100% rename from kasa/tests/fixtures/smart/P115(EU)_1.0_1.2.3.json rename to tests/fixtures/smart/P115(EU)_1.0_1.2.3.json diff --git a/kasa/tests/fixtures/smart/P125M(US)_1.0_1.1.0.json b/tests/fixtures/smart/P125M(US)_1.0_1.1.0.json similarity index 100% rename from kasa/tests/fixtures/smart/P125M(US)_1.0_1.1.0.json rename to tests/fixtures/smart/P125M(US)_1.0_1.1.0.json diff --git a/kasa/tests/fixtures/smart/P135(US)_1.0_1.0.5.json b/tests/fixtures/smart/P135(US)_1.0_1.0.5.json similarity index 100% rename from kasa/tests/fixtures/smart/P135(US)_1.0_1.0.5.json rename to tests/fixtures/smart/P135(US)_1.0_1.0.5.json diff --git a/kasa/tests/fixtures/smart/P300(EU)_1.0_1.0.13.json b/tests/fixtures/smart/P300(EU)_1.0_1.0.13.json similarity index 100% rename from kasa/tests/fixtures/smart/P300(EU)_1.0_1.0.13.json rename to tests/fixtures/smart/P300(EU)_1.0_1.0.13.json diff --git a/kasa/tests/fixtures/smart/P300(EU)_1.0_1.0.15.json b/tests/fixtures/smart/P300(EU)_1.0_1.0.15.json similarity index 100% rename from kasa/tests/fixtures/smart/P300(EU)_1.0_1.0.15.json rename to tests/fixtures/smart/P300(EU)_1.0_1.0.15.json diff --git a/kasa/tests/fixtures/smart/P300(EU)_1.0_1.0.7.json b/tests/fixtures/smart/P300(EU)_1.0_1.0.7.json similarity index 100% rename from kasa/tests/fixtures/smart/P300(EU)_1.0_1.0.7.json rename to tests/fixtures/smart/P300(EU)_1.0_1.0.7.json diff --git a/kasa/tests/fixtures/smart/P304M(UK)_1.0_1.0.3.json b/tests/fixtures/smart/P304M(UK)_1.0_1.0.3.json similarity index 100% rename from kasa/tests/fixtures/smart/P304M(UK)_1.0_1.0.3.json rename to tests/fixtures/smart/P304M(UK)_1.0_1.0.3.json diff --git a/kasa/tests/fixtures/smart/S500D(US)_1.0_1.0.5.json b/tests/fixtures/smart/S500D(US)_1.0_1.0.5.json similarity index 100% rename from kasa/tests/fixtures/smart/S500D(US)_1.0_1.0.5.json rename to tests/fixtures/smart/S500D(US)_1.0_1.0.5.json diff --git a/kasa/tests/fixtures/smart/S505(US)_1.0_1.0.2.json b/tests/fixtures/smart/S505(US)_1.0_1.0.2.json similarity index 100% rename from kasa/tests/fixtures/smart/S505(US)_1.0_1.0.2.json rename to tests/fixtures/smart/S505(US)_1.0_1.0.2.json diff --git a/kasa/tests/fixtures/smart/S505D(US)_1.0_1.1.0.json b/tests/fixtures/smart/S505D(US)_1.0_1.1.0.json similarity index 100% rename from kasa/tests/fixtures/smart/S505D(US)_1.0_1.1.0.json rename to tests/fixtures/smart/S505D(US)_1.0_1.1.0.json diff --git a/kasa/tests/fixtures/smart/TP15(US)_1.0_1.0.3.json b/tests/fixtures/smart/TP15(US)_1.0_1.0.3.json similarity index 100% rename from kasa/tests/fixtures/smart/TP15(US)_1.0_1.0.3.json rename to tests/fixtures/smart/TP15(US)_1.0_1.0.3.json diff --git a/kasa/tests/fixtures/smart/TP25(US)_1.0_1.0.2.json b/tests/fixtures/smart/TP25(US)_1.0_1.0.2.json similarity index 100% rename from kasa/tests/fixtures/smart/TP25(US)_1.0_1.0.2.json rename to tests/fixtures/smart/TP25(US)_1.0_1.0.2.json diff --git a/kasa/tests/fixtures/smart/child/KE100(EU)_1.0_2.4.0.json b/tests/fixtures/smart/child/KE100(EU)_1.0_2.4.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/KE100(EU)_1.0_2.4.0.json rename to tests/fixtures/smart/child/KE100(EU)_1.0_2.4.0.json diff --git a/kasa/tests/fixtures/smart/child/KE100(EU)_1.0_2.8.0.json b/tests/fixtures/smart/child/KE100(EU)_1.0_2.8.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/KE100(EU)_1.0_2.8.0.json rename to tests/fixtures/smart/child/KE100(EU)_1.0_2.8.0.json diff --git a/kasa/tests/fixtures/smart/child/KE100(UK)_1.0_2.8.0.json b/tests/fixtures/smart/child/KE100(UK)_1.0_2.8.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/KE100(UK)_1.0_2.8.0.json rename to tests/fixtures/smart/child/KE100(UK)_1.0_2.8.0.json diff --git a/kasa/tests/fixtures/smart/child/S200B(EU)_1.0_1.11.0.json b/tests/fixtures/smart/child/S200B(EU)_1.0_1.11.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/S200B(EU)_1.0_1.11.0.json rename to tests/fixtures/smart/child/S200B(EU)_1.0_1.11.0.json diff --git a/kasa/tests/fixtures/smart/child/S200B(US)_1.0_1.12.0.json b/tests/fixtures/smart/child/S200B(US)_1.0_1.12.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/S200B(US)_1.0_1.12.0.json rename to tests/fixtures/smart/child/S200B(US)_1.0_1.12.0.json diff --git a/kasa/tests/fixtures/smart/child/S200D(EU)_1.0_1.11.0.json b/tests/fixtures/smart/child/S200D(EU)_1.0_1.11.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/S200D(EU)_1.0_1.11.0.json rename to tests/fixtures/smart/child/S200D(EU)_1.0_1.11.0.json diff --git a/kasa/tests/fixtures/smart/child/S200D(EU)_1.0_1.12.0.json b/tests/fixtures/smart/child/S200D(EU)_1.0_1.12.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/S200D(EU)_1.0_1.12.0.json rename to tests/fixtures/smart/child/S200D(EU)_1.0_1.12.0.json diff --git a/kasa/tests/fixtures/smart/child/T100(EU)_1.0_1.12.0.json b/tests/fixtures/smart/child/T100(EU)_1.0_1.12.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/T100(EU)_1.0_1.12.0.json rename to tests/fixtures/smart/child/T100(EU)_1.0_1.12.0.json diff --git a/kasa/tests/fixtures/smart/child/T110(EU)_1.0_1.8.0.json b/tests/fixtures/smart/child/T110(EU)_1.0_1.8.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/T110(EU)_1.0_1.8.0.json rename to tests/fixtures/smart/child/T110(EU)_1.0_1.8.0.json diff --git a/kasa/tests/fixtures/smart/child/T110(EU)_1.0_1.9.0.json b/tests/fixtures/smart/child/T110(EU)_1.0_1.9.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/T110(EU)_1.0_1.9.0.json rename to tests/fixtures/smart/child/T110(EU)_1.0_1.9.0.json diff --git a/kasa/tests/fixtures/smart/child/T110(US)_1.0_1.9.0.json b/tests/fixtures/smart/child/T110(US)_1.0_1.9.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/T110(US)_1.0_1.9.0.json rename to tests/fixtures/smart/child/T110(US)_1.0_1.9.0.json diff --git a/kasa/tests/fixtures/smart/child/T300(EU)_1.0_1.7.0.json b/tests/fixtures/smart/child/T300(EU)_1.0_1.7.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/T300(EU)_1.0_1.7.0.json rename to tests/fixtures/smart/child/T300(EU)_1.0_1.7.0.json diff --git a/kasa/tests/fixtures/smart/child/T310(EU)_1.0_1.5.0.json b/tests/fixtures/smart/child/T310(EU)_1.0_1.5.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/T310(EU)_1.0_1.5.0.json rename to tests/fixtures/smart/child/T310(EU)_1.0_1.5.0.json diff --git a/kasa/tests/fixtures/smart/child/T310(US)_1.0_1.5.0.json b/tests/fixtures/smart/child/T310(US)_1.0_1.5.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/T310(US)_1.0_1.5.0.json rename to tests/fixtures/smart/child/T310(US)_1.0_1.5.0.json diff --git a/kasa/tests/fixtures/smart/child/T315(EU)_1.0_1.7.0.json b/tests/fixtures/smart/child/T315(EU)_1.0_1.7.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/T315(EU)_1.0_1.7.0.json rename to tests/fixtures/smart/child/T315(EU)_1.0_1.7.0.json diff --git a/kasa/tests/fixtures/smart/child/T315(US)_1.0_1.8.0.json b/tests/fixtures/smart/child/T315(US)_1.0_1.8.0.json similarity index 100% rename from kasa/tests/fixtures/smart/child/T315(US)_1.0_1.8.0.json rename to tests/fixtures/smart/child/T315(US)_1.0_1.8.0.json diff --git a/kasa/tests/fixtures/smartcamera/C210(EU)_2.0_1.4.2.json b/tests/fixtures/smartcamera/C210(EU)_2.0_1.4.2.json similarity index 100% rename from kasa/tests/fixtures/smartcamera/C210(EU)_2.0_1.4.2.json rename to tests/fixtures/smartcamera/C210(EU)_2.0_1.4.2.json diff --git a/kasa/tests/fixtures/smartcamera/C210(EU)_2.0_1.4.3.json b/tests/fixtures/smartcamera/C210(EU)_2.0_1.4.3.json similarity index 100% rename from kasa/tests/fixtures/smartcamera/C210(EU)_2.0_1.4.3.json rename to tests/fixtures/smartcamera/C210(EU)_2.0_1.4.3.json diff --git a/kasa/tests/fixtures/smartcamera/H200(EU)_1.0_1.3.2.json b/tests/fixtures/smartcamera/H200(EU)_1.0_1.3.2.json similarity index 100% rename from kasa/tests/fixtures/smartcamera/H200(EU)_1.0_1.3.2.json rename to tests/fixtures/smartcamera/H200(EU)_1.0_1.3.2.json diff --git a/kasa/tests/fixtures/smartcamera/H200(US)_1.0_1.3.6.json b/tests/fixtures/smartcamera/H200(US)_1.0_1.3.6.json similarity index 100% rename from kasa/tests/fixtures/smartcamera/H200(US)_1.0_1.3.6.json rename to tests/fixtures/smartcamera/H200(US)_1.0_1.3.6.json diff --git a/kasa/tests/fixtures/smartcamera/TC65_1.0_1.3.9.json b/tests/fixtures/smartcamera/TC65_1.0_1.3.9.json similarity index 100% rename from kasa/tests/fixtures/smartcamera/TC65_1.0_1.3.9.json rename to tests/fixtures/smartcamera/TC65_1.0_1.3.9.json diff --git a/kasa/tests/iot/modules/__init__.py b/tests/iot/__init__.py similarity index 100% rename from kasa/tests/iot/modules/__init__.py rename to tests/iot/__init__.py diff --git a/kasa/tests/smart/__init__.py b/tests/iot/modules/__init__.py similarity index 100% rename from kasa/tests/smart/__init__.py rename to tests/iot/modules/__init__.py diff --git a/kasa/tests/iot/modules/test_ambientlight.py b/tests/iot/modules/test_ambientlight.py similarity index 96% rename from kasa/tests/iot/modules/test_ambientlight.py rename to tests/iot/modules/test_ambientlight.py index d7c584750..ff2bd92c2 100644 --- a/kasa/tests/iot/modules/test_ambientlight.py +++ b/tests/iot/modules/test_ambientlight.py @@ -3,7 +3,8 @@ from kasa import Module from kasa.iot import IotDimmer from kasa.iot.modules.ambientlight import AmbientLight -from kasa.tests.device_fixtures import dimmer_iot + +from ...device_fixtures import dimmer_iot @dimmer_iot diff --git a/kasa/tests/iot/modules/test_motion.py b/tests/iot/modules/test_motion.py similarity index 97% rename from kasa/tests/iot/modules/test_motion.py rename to tests/iot/modules/test_motion.py index 932361641..a2b32a877 100644 --- a/kasa/tests/iot/modules/test_motion.py +++ b/tests/iot/modules/test_motion.py @@ -3,7 +3,8 @@ from kasa import Module from kasa.iot import IotDimmer from kasa.iot.modules.motion import Motion, Range -from kasa.tests.device_fixtures import dimmer_iot + +from ...device_fixtures import dimmer_iot @dimmer_iot diff --git a/kasa/tests/iot/test_wallswitch.py b/tests/iot/test_wallswitch.py similarity index 84% rename from kasa/tests/iot/test_wallswitch.py rename to tests/iot/test_wallswitch.py index 07f5976d9..b6fd2a673 100644 --- a/kasa/tests/iot/test_wallswitch.py +++ b/tests/iot/test_wallswitch.py @@ -1,4 +1,4 @@ -from kasa.tests.device_fixtures import wallswitch_iot +from ..device_fixtures import wallswitch_iot @wallswitch_iot diff --git a/kasa/tests/smart/features/__init__.py b/tests/smart/__init__.py similarity index 100% rename from kasa/tests/smart/features/__init__.py rename to tests/smart/__init__.py diff --git a/kasa/tests/smart/modules/__init__.py b/tests/smart/features/__init__.py similarity index 100% rename from kasa/tests/smart/modules/__init__.py rename to tests/smart/features/__init__.py diff --git a/kasa/tests/smart/features/test_brightness.py b/tests/smart/features/test_brightness.py similarity index 95% rename from kasa/tests/smart/features/test_brightness.py rename to tests/smart/features/test_brightness.py index 4a2569c72..ff38854a8 100644 --- a/kasa/tests/smart/features/test_brightness.py +++ b/tests/smart/features/test_brightness.py @@ -2,7 +2,8 @@ from kasa.iot import IotDevice from kasa.smart import SmartDevice -from kasa.tests.conftest import dimmable_iot, get_parent_and_child_modules, parametrize + +from ...conftest import dimmable_iot, get_parent_and_child_modules, parametrize brightness = parametrize("brightness smart", component_filter="brightness") diff --git a/kasa/tests/smart/features/test_colortemp.py b/tests/smart/features/test_colortemp.py similarity index 94% rename from kasa/tests/smart/features/test_colortemp.py rename to tests/smart/features/test_colortemp.py index f4b3c0f51..055c5b299 100644 --- a/kasa/tests/smart/features/test_colortemp.py +++ b/tests/smart/features/test_colortemp.py @@ -1,7 +1,8 @@ import pytest from kasa.smart import SmartDevice -from kasa.tests.conftest import variable_temp_smart + +from ...conftest import variable_temp_smart @variable_temp_smart diff --git a/kasa/tests/smartcamera/__init__.py b/tests/smart/modules/__init__.py similarity index 100% rename from kasa/tests/smartcamera/__init__.py rename to tests/smart/modules/__init__.py diff --git a/kasa/tests/smart/modules/test_autooff.py b/tests/smart/modules/test_autooff.py similarity index 97% rename from kasa/tests/smart/modules/test_autooff.py rename to tests/smart/modules/test_autooff.py index c8582ec54..412bd68c2 100644 --- a/kasa/tests/smart/modules/test_autooff.py +++ b/tests/smart/modules/test_autooff.py @@ -9,7 +9,8 @@ from kasa import Module from kasa.smart import SmartDevice -from kasa.tests.device_fixtures import get_parent_and_child_modules, parametrize + +from ...device_fixtures import get_parent_and_child_modules, parametrize autooff = parametrize( "has autooff", component_filter="auto_off", protocol_filter={"SMART"} diff --git a/kasa/tests/smart/modules/test_childprotection.py b/tests/smart/modules/test_childprotection.py similarity index 95% rename from kasa/tests/smart/modules/test_childprotection.py rename to tests/smart/modules/test_childprotection.py index c8fce03ec..ad2878e57 100644 --- a/kasa/tests/smart/modules/test_childprotection.py +++ b/tests/smart/modules/test_childprotection.py @@ -2,7 +2,8 @@ from kasa import Module from kasa.smart.modules import ChildProtection -from kasa.tests.device_fixtures import parametrize + +from ...device_fixtures import parametrize child_protection = parametrize( "has child protection", diff --git a/kasa/tests/smart/modules/test_contact.py b/tests/smart/modules/test_contact.py similarity index 92% rename from kasa/tests/smart/modules/test_contact.py rename to tests/smart/modules/test_contact.py index 732952a4e..56287e2a3 100644 --- a/kasa/tests/smart/modules/test_contact.py +++ b/tests/smart/modules/test_contact.py @@ -1,7 +1,8 @@ import pytest from kasa import Module, SmartDevice -from kasa.tests.device_fixtures import parametrize + +from ...device_fixtures import parametrize contact = parametrize( "is contact sensor", model_filter="T110", protocol_filter={"SMART.CHILD"} diff --git a/kasa/tests/smart/modules/test_fan.py b/tests/smart/modules/test_fan.py similarity index 96% rename from kasa/tests/smart/modules/test_fan.py rename to tests/smart/modules/test_fan.py index 3781ccd9f..a032794cb 100644 --- a/kasa/tests/smart/modules/test_fan.py +++ b/tests/smart/modules/test_fan.py @@ -3,7 +3,8 @@ from kasa import Module from kasa.smart import SmartDevice -from kasa.tests.device_fixtures import get_parent_and_child_modules, parametrize + +from ...device_fixtures import get_parent_and_child_modules, parametrize fan = parametrize("has fan", component_filter="fan_control", protocol_filter={"SMART"}) diff --git a/kasa/tests/smart/modules/test_firmware.py b/tests/smart/modules/test_firmware.py similarity index 98% rename from kasa/tests/smart/modules/test_firmware.py rename to tests/smart/modules/test_firmware.py index 013533d0e..c1961b415 100644 --- a/kasa/tests/smart/modules/test_firmware.py +++ b/tests/smart/modules/test_firmware.py @@ -11,7 +11,8 @@ from kasa import KasaException, Module from kasa.smart import SmartDevice from kasa.smart.modules.firmware import DownloadState -from kasa.tests.device_fixtures import parametrize + +from ...device_fixtures import parametrize firmware = parametrize( "has firmware", component_filter="firmware", protocol_filter={"SMART"} diff --git a/kasa/tests/smart/modules/test_humidity.py b/tests/smart/modules/test_humidity.py similarity index 92% rename from kasa/tests/smart/modules/test_humidity.py rename to tests/smart/modules/test_humidity.py index 52760b230..5e14a05b4 100644 --- a/kasa/tests/smart/modules/test_humidity.py +++ b/tests/smart/modules/test_humidity.py @@ -1,7 +1,8 @@ import pytest from kasa.smart.modules import HumiditySensor -from kasa.tests.device_fixtures import parametrize + +from ...device_fixtures import parametrize humidity = parametrize( "has humidity", component_filter="humidity", protocol_filter={"SMART.CHILD"} diff --git a/kasa/tests/smart/modules/test_light_effect.py b/tests/smart/modules/test_light_effect.py similarity index 98% rename from kasa/tests/smart/modules/test_light_effect.py rename to tests/smart/modules/test_light_effect.py index 27869bf25..a48b29add 100644 --- a/kasa/tests/smart/modules/test_light_effect.py +++ b/tests/smart/modules/test_light_effect.py @@ -7,7 +7,8 @@ from kasa import Device, Feature, Module from kasa.smart.modules import LightEffect -from kasa.tests.device_fixtures import parametrize + +from ...device_fixtures import parametrize light_effect = parametrize( "has light effect", component_filter="light_effect", protocol_filter={"SMART"} diff --git a/kasa/tests/smart/modules/test_light_strip_effect.py b/tests/smart/modules/test_light_strip_effect.py similarity index 98% rename from kasa/tests/smart/modules/test_light_strip_effect.py rename to tests/smart/modules/test_light_strip_effect.py index f18bf9faf..a3db847e3 100644 --- a/kasa/tests/smart/modules/test_light_strip_effect.py +++ b/tests/smart/modules/test_light_strip_effect.py @@ -7,7 +7,8 @@ from kasa import Device, Feature, Module from kasa.smart.modules import LightEffect, LightStripEffect -from kasa.tests.device_fixtures import parametrize + +from ...device_fixtures import parametrize light_strip_effect = parametrize( "has light strip effect", diff --git a/kasa/tests/smart/modules/test_lighttransition.py b/tests/smart/modules/test_lighttransition.py similarity index 95% rename from kasa/tests/smart/modules/test_lighttransition.py rename to tests/smart/modules/test_lighttransition.py index beee68b37..c1b805e48 100644 --- a/kasa/tests/smart/modules/test_lighttransition.py +++ b/tests/smart/modules/test_lighttransition.py @@ -2,8 +2,9 @@ from kasa import Feature, Module from kasa.smart import SmartDevice -from kasa.tests.device_fixtures import get_parent_and_child_modules, parametrize -from kasa.tests.fixtureinfo import ComponentFilter + +from ...device_fixtures import get_parent_and_child_modules, parametrize +from ...fixtureinfo import ComponentFilter light_transition_v1 = parametrize( "has light transition", diff --git a/kasa/tests/smart/modules/test_motionsensor.py b/tests/smart/modules/test_motionsensor.py similarity index 92% rename from kasa/tests/smart/modules/test_motionsensor.py rename to tests/smart/modules/test_motionsensor.py index 06033ea76..91119a759 100644 --- a/kasa/tests/smart/modules/test_motionsensor.py +++ b/tests/smart/modules/test_motionsensor.py @@ -1,7 +1,8 @@ import pytest from kasa import Module, SmartDevice -from kasa.tests.device_fixtures import parametrize + +from ...device_fixtures import parametrize motion = parametrize( "is motion sensor", model_filter="T100", protocol_filter={"SMART.CHILD"} diff --git a/kasa/tests/smart/modules/test_temperature.py b/tests/smart/modules/test_temperature.py similarity index 96% rename from kasa/tests/smart/modules/test_temperature.py rename to tests/smart/modules/test_temperature.py index 3354002db..c2f91ae1d 100644 --- a/kasa/tests/smart/modules/test_temperature.py +++ b/tests/smart/modules/test_temperature.py @@ -1,7 +1,8 @@ import pytest from kasa.smart.modules import TemperatureSensor -from kasa.tests.device_fixtures import parametrize + +from ...device_fixtures import parametrize temperature = parametrize( "has temperature", component_filter="temperature", protocol_filter={"SMART.CHILD"} diff --git a/kasa/tests/smart/modules/test_temperaturecontrol.py b/tests/smart/modules/test_temperaturecontrol.py similarity index 98% rename from kasa/tests/smart/modules/test_temperaturecontrol.py rename to tests/smart/modules/test_temperaturecontrol.py index f186b63f7..2653c53e1 100644 --- a/kasa/tests/smart/modules/test_temperaturecontrol.py +++ b/tests/smart/modules/test_temperaturecontrol.py @@ -5,7 +5,8 @@ from kasa.smart.modules import TemperatureControl from kasa.smart.modules.temperaturecontrol import ThermostatState -from kasa.tests.device_fixtures import parametrize, thermostats_smart + +from ...device_fixtures import parametrize, thermostats_smart temperature = parametrize( "has temperature control", diff --git a/kasa/tests/smart/modules/test_waterleak.py b/tests/smart/modules/test_waterleak.py similarity index 96% rename from kasa/tests/smart/modules/test_waterleak.py rename to tests/smart/modules/test_waterleak.py index 8704ae81f..318973922 100644 --- a/kasa/tests/smart/modules/test_waterleak.py +++ b/tests/smart/modules/test_waterleak.py @@ -4,7 +4,8 @@ import pytest from kasa.smart.modules import WaterleakSensor -from kasa.tests.device_fixtures import parametrize + +from ...device_fixtures import parametrize waterleak = parametrize( "has waterleak", component_filter="sensor_alarm", protocol_filter={"SMART.CHILD"} diff --git a/tests/smartcamera/__init__.py b/tests/smartcamera/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/kasa/tests/smartcamera/test_smartcamera.py b/tests/smartcamera/test_smartcamera.py similarity index 100% rename from kasa/tests/smartcamera/test_smartcamera.py rename to tests/smartcamera/test_smartcamera.py diff --git a/kasa/tests/test_aestransport.py b/tests/test_aestransport.py similarity index 98% rename from kasa/tests/test_aestransport.py rename to tests/test_aestransport.py index f1dbfb320..1bc6d8dd2 100644 --- a/kasa/tests/test_aestransport.py +++ b/tests/test_aestransport.py @@ -18,16 +18,16 @@ from freezegun.api import FrozenDateTimeFactory from yarl import URL -from ..aestransport import AesEncyptionSession, AesTransport, TransportState -from ..credentials import Credentials -from ..deviceconfig import DeviceConfig -from ..exceptions import ( +from kasa.aestransport import AesEncyptionSession, AesTransport, TransportState +from kasa.credentials import Credentials +from kasa.deviceconfig import DeviceConfig +from kasa.exceptions import ( AuthenticationError, KasaException, SmartErrorCode, _ConnectionError, ) -from ..httpclient import HttpClient +from kasa.httpclient import HttpClient DUMMY_QUERY = {"foobar": {"foo": "bar", "bar": "foo"}} diff --git a/kasa/tests/test_bulb.py b/tests/test_bulb.py similarity index 100% rename from kasa/tests/test_bulb.py rename to tests/test_bulb.py diff --git a/kasa/tests/test_childdevice.py b/tests/test_childdevice.py similarity index 100% rename from kasa/tests/test_childdevice.py rename to tests/test_childdevice.py diff --git a/kasa/tests/test_cli.py b/tests/test_cli.py similarity index 100% rename from kasa/tests/test_cli.py rename to tests/test_cli.py diff --git a/kasa/tests/test_common_modules.py b/tests/test_common_modules.py similarity index 99% rename from kasa/tests/test_common_modules.py rename to tests/test_common_modules.py index 1096260e7..5e2622b9b 100644 --- a/kasa/tests/test_common_modules.py +++ b/tests/test_common_modules.py @@ -6,7 +6,8 @@ from zoneinfo import ZoneInfo from kasa import Device, LightState, Module -from kasa.tests.device_fixtures import ( + +from .device_fixtures import ( bulb_iot, bulb_smart, dimmable_iot, diff --git a/kasa/tests/test_device.py b/tests/test_device.py similarity index 100% rename from kasa/tests/test_device.py rename to tests/test_device.py diff --git a/kasa/tests/test_device_factory.py b/tests/test_device_factory.py similarity index 100% rename from kasa/tests/test_device_factory.py rename to tests/test_device_factory.py diff --git a/kasa/tests/test_device_type.py b/tests/test_device_type.py similarity index 100% rename from kasa/tests/test_device_type.py rename to tests/test_device_type.py diff --git a/kasa/tests/test_deviceconfig.py b/tests/test_deviceconfig.py similarity index 100% rename from kasa/tests/test_deviceconfig.py rename to tests/test_deviceconfig.py diff --git a/kasa/tests/test_dimmer.py b/tests/test_dimmer.py similarity index 100% rename from kasa/tests/test_dimmer.py rename to tests/test_dimmer.py diff --git a/kasa/tests/test_discovery.py b/tests/test_discovery.py similarity index 100% rename from kasa/tests/test_discovery.py rename to tests/test_discovery.py diff --git a/kasa/tests/test_emeter.py b/tests/test_emeter.py similarity index 100% rename from kasa/tests/test_emeter.py rename to tests/test_emeter.py diff --git a/kasa/tests/test_feature.py b/tests/test_feature.py similarity index 100% rename from kasa/tests/test_feature.py rename to tests/test_feature.py diff --git a/kasa/tests/test_httpclient.py b/tests/test_httpclient.py similarity index 95% rename from kasa/tests/test_httpclient.py rename to tests/test_httpclient.py index 6200d0fdb..ed7ce5383 100644 --- a/kasa/tests/test_httpclient.py +++ b/tests/test_httpclient.py @@ -4,13 +4,13 @@ import aiohttp import pytest -from ..deviceconfig import DeviceConfig -from ..exceptions import ( +from kasa.deviceconfig import DeviceConfig +from kasa.exceptions import ( KasaException, TimeoutError, _ConnectionError, ) -from ..httpclient import HttpClient +from kasa.httpclient import HttpClient @pytest.mark.parametrize( diff --git a/kasa/tests/test_iotdevice.py b/tests/test_iotdevice.py similarity index 100% rename from kasa/tests/test_iotdevice.py rename to tests/test_iotdevice.py diff --git a/kasa/tests/test_klapprotocol.py b/tests/test_klapprotocol.py similarity index 98% rename from kasa/tests/test_klapprotocol.py rename to tests/test_klapprotocol.py index ce370b5b6..55df0b34e 100644 --- a/kasa/tests/test_klapprotocol.py +++ b/tests/test_klapprotocol.py @@ -9,26 +9,26 @@ import pytest from yarl import URL -from ..aestransport import AesTransport -from ..credentials import Credentials -from ..deviceconfig import DeviceConfig -from ..exceptions import ( +from kasa.aestransport import AesTransport +from kasa.credentials import Credentials +from kasa.deviceconfig import DeviceConfig +from kasa.exceptions import ( AuthenticationError, KasaException, TimeoutError, _ConnectionError, _RetryableError, ) -from ..httpclient import HttpClient -from ..iotprotocol import IotProtocol -from ..klaptransport import ( +from kasa.httpclient import HttpClient +from kasa.iotprotocol import IotProtocol +from kasa.klaptransport import ( KlapEncryptionSession, KlapTransport, KlapTransportV2, _sha256, ) -from ..protocol import DEFAULT_CREDENTIALS, get_default_credentials -from ..smartprotocol import SmartProtocol +from kasa.protocol import DEFAULT_CREDENTIALS, get_default_credentials +from kasa.smartprotocol import SmartProtocol DUMMY_QUERY = {"foobar": {"foo": "bar", "bar": "foo"}} diff --git a/kasa/tests/test_lightstrip.py b/tests/test_lightstrip.py similarity index 100% rename from kasa/tests/test_lightstrip.py rename to tests/test_lightstrip.py diff --git a/kasa/tests/test_plug.py b/tests/test_plug.py similarity index 100% rename from kasa/tests/test_plug.py rename to tests/test_plug.py diff --git a/kasa/tests/test_protocol.py b/tests/test_protocol.py similarity index 98% rename from kasa/tests/test_protocol.py rename to tests/test_protocol.py index 9c15795f1..6c79885db 100644 --- a/kasa/tests/test_protocol.py +++ b/tests/test_protocol.py @@ -13,22 +13,22 @@ import pytest +from kasa.aestransport import AesTransport +from kasa.credentials import Credentials +from kasa.device import Device +from kasa.deviceconfig import DeviceConfig +from kasa.exceptions import KasaException from kasa.iot import IotDevice - -from ..aestransport import AesTransport -from ..credentials import Credentials -from ..device import Device -from ..deviceconfig import DeviceConfig -from ..exceptions import KasaException -from ..iotprotocol import IotProtocol, _deprecated_TPLinkSmartHomeProtocol -from ..klaptransport import KlapTransport, KlapTransportV2 -from ..protocol import ( +from kasa.iotprotocol import IotProtocol, _deprecated_TPLinkSmartHomeProtocol +from kasa.klaptransport import KlapTransport, KlapTransportV2 +from kasa.protocol import ( BaseProtocol, BaseTransport, mask_mac, redact_data, ) -from ..xortransport import XorEncryption, XorTransport +from kasa.xortransport import XorEncryption, XorTransport + from .conftest import device_iot from .fakeprotocol_iot import FakeIotTransport diff --git a/kasa/tests/test_readme_examples.py b/tests/test_readme_examples.py similarity index 99% rename from kasa/tests/test_readme_examples.py rename to tests/test_readme_examples.py index cbaff9c55..f8f433d47 100644 --- a/kasa/tests/test_readme_examples.py +++ b/tests/test_readme_examples.py @@ -3,7 +3,7 @@ import pytest import xdoctest -from kasa.tests.conftest import ( +from .conftest import ( get_device_for_fixture_protocol, get_fixture_info, patch_discovery, diff --git a/kasa/tests/test_smartdevice.py b/tests/test_smartdevice.py similarity index 100% rename from kasa/tests/test_smartdevice.py rename to tests/test_smartdevice.py diff --git a/kasa/tests/test_smartprotocol.py b/tests/test_smartprotocol.py similarity index 99% rename from kasa/tests/test_smartprotocol.py rename to tests/test_smartprotocol.py index 420c10fc3..19e62a3dd 100644 --- a/kasa/tests/test_smartprotocol.py +++ b/tests/test_smartprotocol.py @@ -4,15 +4,15 @@ import pytest import pytest_mock -from kasa.smart import SmartDevice - -from ..exceptions import ( +from kasa.exceptions import ( SMART_RETRYABLE_ERRORS, DeviceError, KasaException, SmartErrorCode, ) -from ..smartprotocol import SmartProtocol, _ChildProtocolWrapper +from kasa.smart import SmartDevice +from kasa.smartprotocol import SmartProtocol, _ChildProtocolWrapper + from .conftest import device_smart from .fakeprotocol_smart import FakeSmartTransport diff --git a/kasa/tests/test_sslaestransport.py b/tests/test_sslaestransport.py similarity index 97% rename from kasa/tests/test_sslaestransport.py rename to tests/test_sslaestransport.py index bea10528b..30c74234c 100644 --- a/kasa/tests/test_sslaestransport.py +++ b/tests/test_sslaestransport.py @@ -11,18 +11,21 @@ import pytest from yarl import URL -from kasa.protocol import DEFAULT_CREDENTIALS, get_default_credentials - -from ..aestransport import AesEncyptionSession -from ..credentials import Credentials -from ..deviceconfig import DeviceConfig -from ..exceptions import ( +from kasa.aestransport import AesEncyptionSession +from kasa.credentials import Credentials +from kasa.deviceconfig import DeviceConfig +from kasa.exceptions import ( AuthenticationError, KasaException, SmartErrorCode, ) -from ..experimental.sslaestransport import SslAesTransport, TransportState, _sha256_hash -from ..httpclient import HttpClient +from kasa.experimental.sslaestransport import ( + SslAesTransport, + TransportState, + _sha256_hash, +) +from kasa.httpclient import HttpClient +from kasa.protocol import DEFAULT_CREDENTIALS, get_default_credentials MOCK_ADMIN_USER = get_default_credentials(DEFAULT_CREDENTIALS["TAPOCAMERA"]).username MOCK_PWD = "correct_pwd" # noqa: S105 diff --git a/kasa/tests/test_strip.py b/tests/test_strip.py similarity index 100% rename from kasa/tests/test_strip.py rename to tests/test_strip.py diff --git a/kasa/tests/test_usage.py b/tests/test_usage.py similarity index 100% rename from kasa/tests/test_usage.py rename to tests/test_usage.py From 1a46879eef377f8055a81ccc67ada2d670dbacd8 Mon Sep 17 00:00:00 2001 From: Steven B <51370195+sdb9696@users.noreply.github.com> Date: Mon, 11 Nov 2024 10:04:56 +0000 Subject: [PATCH 2/2] Add tests to sdist --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 9db7474c6..92ef7bbe3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,6 +71,7 @@ include = [ "/kasa", "/devtools", "/docs", + "/tests", "/CHANGELOG.md", ]