evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump aioshelly to version 7.0.0 (#105384)

Browse source 
* Remove get_rpc_device_sleep_period() function

* Bump aioshelly version to 7.0.0

* Remove firmware compatibility check from BLE scanner

* Remove firmware compatibility check from light transition

* Update default fw ver

* Use LightEntityFeature in tests
This commit is contained in:
Maciej Bieniek 2023-12-09 16:12:05 +01:00 • committed by GitHub
parent f37f40c338
commit 35b733fa2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 18 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tests/components/shelly/conftest.py
View file

@ -157,14 +157,13 @@ MOCK_CONFIG = {
"sys": {
"ui_data": {},
"device": {"name": "Test name"},
"wakeup_period": 0,
},
}
MOCK_SHELLY_COAP = {
"mac": MOCK_MAC,
"auth": False,
"fw": "20201124-092854/v1.9.0@57ac4ad8",
"fw": "20210715-092854/v1.11.0@57ac4ad8",
"num_outputs": 2,
}
@ -174,8 +173,8 @@ MOCK_SHELLY_RPC = {
"mac": MOCK_MAC,
"model": MODEL_PLUS_2PM,
"gen": 2,
"fw_id": "20220830-130540/0.11.0-gfa1bc37",
"ver": "0.11.0",
"fw_id": "20230803-130540/1.0.0-gfa1bc37",
"ver": "1.0.0",
"app": "Plus2PM",
"auth_en": False,
"auth_domain": None,
@ -290,7 +289,7 @@ async def mock_block_device():
blocks=MOCK_BLOCKS,
settings=MOCK_SETTINGS,
shelly=MOCK_SHELLY_COAP,
version="0.10.0",
version="1.11.0",
status=MOCK_STATUS_COAP,
firmware_version="some fw string",
initialized=True,
@ -314,7 +313,7 @@ def _mock_rpc_device(version: str | None = None):
config=MOCK_CONFIG,
event={},
shelly=MOCK_SHELLY_RPC,
version=version or "0.12.0",
version=version or "1.0.0",
hostname="test-host",
status=MOCK_STATUS_RPC,
firmware_version="some fw string",
@ -324,23 +323,6 @@ def _mock_rpc_device(version: str | None = None):
return device
@pytest.fixture
async def mock_pre_ble_rpc_device():
"""Mock rpc (Gen2, Websocket) device pre BLE."""
with patch("aioshelly.rpc_device.RpcDevice.create") as rpc_device_mock:
def update():
rpc_device_mock.return_value.subscribe_updates.call_args[0][0](
{}, RpcUpdateType.STATUS
)
device = _mock_rpc_device("0.11.0")
rpc_device_mock.return_value = device
rpc_device_mock.return_value.mock_update = Mock(side_effect=update)
yield rpc_device_mock.return_value
@pytest.fixture
async def mock_rpc_device():
"""Mock rpc (Gen2, Websocket) device with BLE support."""
@ -363,7 +345,7 @@ async def mock_rpc_device():
{}, RpcUpdateType.DISCONNECTED
)
device = _mock_rpc_device("0.12.0")
device = _mock_rpc_device()
rpc_device_mock.return_value = device
rpc_device_mock.return_value.mock_disconnected = Mock(side_effect=disconnected)
rpc_device_mock.return_value.mock_update = Mock(side_effect=update)