Skip to content

Add KP125M fixture and allow passing credentials for tests #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rytilahti merged 7 commits into from
Dec 7, 2023
Merged

Add KP125M fixture and allow passing credentials for tests #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c831d69
Add KP125M fixture. Enable tapo auth in pytest.
sbytnar Dec 5, 2023
59fc078
authentication is not just for tapo
sbytnar Dec 6, 2023
490205d
authentication isn't just for tapo
sbytnar Dec 6, 2023
5acb68b
Review - rename fixture file.
sbytnar Dec 6, 2023
4448b0d
Merge remote-tracking branch 'origin/master' into KP124M-fixture
sbytnar Dec 6, 2023
bac20d3
Use "##MASKEDNAME##" base64 for nickname and ssid.
sbytnar Dec 6, 2023
8c5400a
Merge branch 'master' into KP125M-fixture
sbytnar Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions kasa/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
"KP105",
"KP115",
"KP125",
"KP125M",
"KP401",
"KS200M",
}
Expand All @@ -103,11 +104,11 @@
DIMMERS = {"ES20M", "HS220", "KS220M", "KS230", "KP405"}

DIMMABLE = {*BULBS, *DIMMERS}
WITH_EMETER = {"HS110", "HS300", "KP115", "KP125", *BULBS}
WITH_EMETER = {"HS110", "HS300", "KP115", "KP125", "KP125M", *BULBS}

ALL_DEVICES_IOT = BULBS.union(PLUGS).union(STRIPS).union(DIMMERS)

PLUGS_SMART = {"P110"}
PLUGS_SMART = {"P110", "KP125M"}
ALL_DEVICES_SMART = BULBS_SMART.union(PLUGS_SMART)

ALL_DEVICES = ALL_DEVICES_IOT.union(ALL_DEVICES_SMART)
Expand Down Expand Up @@ -297,8 +298,12 @@ async def _update_and_close(d):
return d


async def _discover_update_and_close(ip):
d = await Discover.discover_single(ip, timeout=10)
async def _discover_update_and_close(ip, username, password):
if username and password:
credentials = Credentials(username=username, password=password)
else:
credentials = None
d = await Discover.discover_single(ip, timeout=10, credentials=credentials)
return await _update_and_close(d)


Expand Down Expand Up @@ -339,15 +344,17 @@ async def dev(request):
file, protocol = request.param

ip = request.config.getoption("--ip")
username = request.config.getoption("--username")
password = request.config.getoption("--password")
if ip:
model = IP_MODEL_CACHE.get(ip)
d = None
if not model:
d = await _discover_update_and_close(ip)
d = await _discover_update_and_close(ip, username, password)
IP_MODEL_CACHE[ip] = model = d.model
if model not in file:
pytest.skip(f"skipping file {file}")
return d if d else await _discover_update_and_close(ip)
return d if d else await _discover_update_and_close(ip, username, password)

return await get_device_for_file(file, protocol)

Expand Down Expand Up @@ -411,6 +418,12 @@ def pytest_addoption(parser):
parser.addoption(
"--ip", action="store", default=None, help="run against device on given ip"
)
parser.addoption(
"--username", action="store", default=None, help="authentication username"
)
parser.addoption(
"--password", action="store", default=None, help="authentication password"
)


def pytest_collection_modifyitems(config, items):
Expand Down
175 changes: 175 additions & 0 deletions kasa/tests/fixtures/smart/KP125M(US)_1.0_1.1.3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
{
"component_nego": {
"component_list": [
{
"id": "device",
"ver_code": 2
},
{
"id": "firmware",
"ver_code": 2
},
{
"id": "quick_setup",
"ver_code": 3
},
{
"id": "time",
"ver_code": 1
},
{
"id": "wireless",
"ver_code": 1
},
{
"id": "schedule",
"ver_code": 2
},
{
"id": "countdown",
"ver_code": 2
},
{
"id": "antitheft",
"ver_code": 1
},
{
"id": "account",
"ver_code": 1
},
{
"id": "synchronize",
"ver_code": 1
},
{
"id": "sunrise_sunset",
"ver_code": 1
},
{
"id": "led",
"ver_code": 1
},
{
"id": "cloud_connect",
"ver_code": 1
},
{
"id": "iot_cloud",
"ver_code": 1
},
{
"id": "device_local_time",
"ver_code": 1
},
{
"id": "default_states",
"ver_code": 1
},
{
"id": "auto_off",
"ver_code": 2
},
{
"id": "energy_monitoring",
"ver_code": 2
},
{
"id": "power_protection",
"ver_code": 1
},
{
"id": "matter",
"ver_code": 2
}
]
},
"discovery_result": {
"device_id": "00000000000000000000000000000000",
"device_model": "KP125M(US)",
"device_type": "SMART.KASAPLUG",
"factory_default": false,
"ip": "127.0.0.123",
"is_support_iot_cloud": true,
"mac": "00-00-00-00-00-00",
"mgt_encrypt_schm": {
"encrypt_type": "AES",
"http_port": 80,
"is_support_https": false,
"lv": 2
},
"obd_src": "tplink",
"owner": "00000000000000000000000000000000"
},
"get_current_power": {
"current_power": 17
},
"get_device_info": {
"auto_off_remain_time": 0,
"auto_off_status": "off",
"avatar": "coffee_maker",
"default_states": {
"state": {},
"type": "last_states"
},
"device_id": "0000000000000000000000000000000000000000",
"device_on": true,
"fw_id": "00000000000000000000000000000000",
"fw_ver": "1.1.3 Build 230801 Rel.092557",
"has_set_location_info": true,
"hw_id": "00000000000000000000000000000000",
"hw_ver": "1.0",
"ip": "127.0.0.123",
"lang": "en_US",
"latitude": 0,
"longitude": 0,
"mac": "00-00-00-00-00-00",
"model": "KP125M",
"nickname": "IyNNQVNLRUROQU1FIyM=",
"oem_id": "00000000000000000000000000000000",
"on_time": 5332,
"overheated": false,
"power_protection_status": "normal",
"region": "America/Chicago",
"rssi": -62,
"signal_level": 2,
"specs": "",
"ssid": "IyNNQVNLRUROQU1FIyM=",
"time_diff": -360,
"type": "SMART.KASAPLUG"
},
"get_device_time": {
"region": "America/Chicago",
"time_diff": -360,
"timestamp": 1701569348
},
"get_device_usage": {
"power_usage": {
"past30": 6757,
"past7": 4101,
"today": 513
},
"saved_power": {
"past30": 9516,
"past7": 5748,
"today": 696
},
"time_usage": {
"past30": 16273,
"past7": 9849,
"today": 1209
}
},
"get_energy_usage": {
"current_power": 17654,
"electricity_charge": [
0,
64,
111
],
"local_time": "2023-12-02 20:09:08",
"month_energy": 1020,
"month_runtime": 2649,
"today_energy": 513,
"today_runtime": 1209
}
}