Pass in parameters explicitly to DeconzSession (#29617)

Dont pass in loop to DeconzSession
Services will use new refresh state method
This commit is contained in:
Robert Svensson authored and GitHub committed 2019-12-08 16:53:34 +01:00
1 parent 00dc721609
commit 57a3f7d5c8
16 files changed
+219 -137

No files matched your search

+10 -3
View File
@@ -95,7 +95,14 @@ async def test_binary_sensors(hass):
vibration_sensor = hass.states.get("binary_sensor.vibration_sensor")
assert vibration_sensor.state == "on"
gateway.api.sensors["1"].async_update({"state": {"presence": True}})
state_changed_event = {
"t": "event",
"e": "changed",
"r": "sensors",
"id": "1",
"state": {"presence": True},
}
gateway.api.async_event_handler(state_changed_event)
await hass.async_block_till_done()
presence_sensor = hass.states.get("binary_sensor.presence_sensor")
@@ -143,14 +150,14 @@ async def test_add_new_binary_sensor(hass):
)
assert len(gateway.deconz_ids) == 0
state_added = {
state_added_event = {
"t": "event",
"e": "added",
"r": "sensors",
"id": "1",
"sensor": deepcopy(SENSORS["1"]),
}
gateway.api.async_event_handler(state_added)
gateway.api.async_event_handler(state_added_event)
await hass.async_block_till_done()
assert "binary_sensor.presence_sensor" in gateway.deconz_ids
+47 -25
View File
@@ -94,21 +94,41 @@ async def test_climate_devices(hass):
clip_thermostat = hass.states.get("climate.clip_thermostat")
assert clip_thermostat is None
thermostat_device = gateway.api.sensors["1"]
thermostat_device.async_update({"config": {"mode": "off"}})
state_changed_event = {
"t": "event",
"e": "changed",
"r": "sensors",
"id": "1",
"config": {"mode": "off"},
}
gateway.api.async_event_handler(state_changed_event)
await hass.async_block_till_done()
thermostat = hass.states.get("climate.thermostat")
assert thermostat.state == "off"
thermostat_device.async_update({"config": {"mode": "other"}, "state": {"on": True}})
state_changed_event = {
"t": "event",
"e": "changed",
"r": "sensors",
"id": "1",
"config": {"mode": "other"},
"state": {"on": True},
}
gateway.api.async_event_handler(state_changed_event)
await hass.async_block_till_done()
thermostat = hass.states.get("climate.thermostat")
assert thermostat.state == "heat"
thermostat_device.async_update({"state": {"on": False}})
state_changed_event = {
"t": "event",
"e": "changed",
"r": "sensors",
"id": "1",
"state": {"on": False},
}
gateway.api.async_event_handler(state_changed_event)
await hass.async_block_till_done()
thermostat = hass.states.get("climate.thermostat")
@@ -116,9 +136,9 @@ async def test_climate_devices(hass):
# Verify service calls
with patch.object(
thermostat_device, "_async_set_callback", return_value=True
) as set_callback:
thermostat_device = gateway.api.sensors["1"]
with patch.object(thermostat_device, "_request", return_value=True) as set_callback:
await hass.services.async_call(
climate.DOMAIN,
climate.SERVICE_SET_HVAC_MODE,
@@ -126,11 +146,11 @@ async def test_climate_devices(hass):
blocking=True,
)
await hass.async_block_till_done()
set_callback.assert_called_with("/sensors/1/config", {"mode": "auto"})
set_callback.assert_called_with(
"put", "/sensors/1/config", json={"mode": "auto"}
)
with patch.object(
thermostat_device, "_async_set_callback", return_value=True
) as set_callback:
with patch.object(thermostat_device, "_request", return_value=True) as set_callback:
await hass.services.async_call(
climate.DOMAIN,
climate.SERVICE_SET_HVAC_MODE,
@@ -138,29 +158,31 @@ async def test_climate_devices(hass):
blocking=True,
)
await hass.async_block_till_done()
set_callback.assert_called_with("/sensors/1/config", {"mode": "heat"})
set_callback.assert_called_with(
"put", "/sensors/1/config", json={"mode": "heat"}
)
with patch.object(
thermostat_device, "_async_set_callback", return_value=True
) as set_callback:
with patch.object(thermostat_device, "_request", return_value=True) as set_callback:
await hass.services.async_call(
climate.DOMAIN,
climate.SERVICE_SET_HVAC_MODE,
{"entity_id": "climate.thermostat", "hvac_mode": "off"},
blocking=True,
)
set_callback.assert_called_with("/sensors/1/config", {"mode": "off"})
set_callback.assert_called_with(
"put", "/sensors/1/config", json={"mode": "off"}
)
with patch.object(
thermostat_device, "_async_set_callback", return_value=True
) as set_callback:
with patch.object(thermostat_device, "_request", return_value=True) as set_callback:
await hass.services.async_call(
climate.DOMAIN,
climate.SERVICE_SET_TEMPERATURE,
{"entity_id": "climate.thermostat", "temperature": 20},
blocking=True,
)
set_callback.assert_called_with("/sensors/1/config", {"heatsetpoint": 2000.0})
set_callback.assert_called_with(
"put", "/sensors/1/config", json={"heatsetpoint": 2000.0}
)
await gateway.async_reset()
@@ -212,14 +234,14 @@ async def test_verify_state_update(hass):
thermostat = hass.states.get("climate.thermostat")
assert thermostat.state == "auto"
state_update = {
state_changed_event = {
"t": "event",
"e": "changed",
"r": "sensors",
"id": "1",
"state": {"on": False},
}
gateway.api.async_event_handler(state_update)
gateway.api.async_event_handler(state_changed_event)
await hass.async_block_till_done()
thermostat = hass.states.get("climate.thermostat")
@@ -235,14 +257,14 @@ async def test_add_new_climate_device(hass):
)
assert len(gateway.deconz_ids) == 0
state_added = {
state_added_event = {
"t": "event",
"e": "added",
"r": "sensors",
"id": "1",
"sensor": deepcopy(SENSORS["1"]),
}
gateway.api.async_event_handler(state_added)
gateway.api.async_event_handler(state_added_event)
await hass.async_block_till_done()
assert "climate.thermostat" in gateway.deconz_ids
+18 -9
View File
@@ -73,16 +73,23 @@ async def test_cover(hass):
level_controllable_cover = hass.states.get("cover.level_controllable_cover")
assert level_controllable_cover.state == "open"
level_controllable_cover_device = gateway.api.lights["1"]
level_controllable_cover_device.async_update({"state": {"on": True}})
state_changed_event = {
"t": "event",
"e": "changed",
"r": "lights",
"id": "1",
"state": {"on": True},
}
gateway.api.async_event_handler(state_changed_event)
await hass.async_block_till_done()
level_controllable_cover = hass.states.get("cover.level_controllable_cover")
assert level_controllable_cover.state == "closed"
level_controllable_cover_device = gateway.api.lights["1"]
with patch.object(
level_controllable_cover_device, "_async_set_callback", return_value=True
level_controllable_cover_device, "_request", return_value=True
) as set_callback:
await hass.services.async_call(
cover.DOMAIN,
@@ -91,10 +98,10 @@ async def test_cover(hass):
blocking=True,
)
await hass.async_block_till_done()
set_callback.assert_called_with("/lights/1/state", {"on": False})
set_callback.assert_called_with("put", "/lights/1/state", json={"on": False})
with patch.object(
level_controllable_cover_device, "_async_set_callback", return_value=True
level_controllable_cover_device, "_request", return_value=True
) as set_callback:
await hass.services.async_call(
cover.DOMAIN,
@@ -103,10 +110,12 @@ async def test_cover(hass):
blocking=True,
)
await hass.async_block_till_done()
set_callback.assert_called_with("/lights/1/state", {"on": True, "bri": 255})
set_callback.assert_called_with(
"put", "/lights/1/state", json={"on": True, "bri": 255}
)
with patch.object(
level_controllable_cover_device, "_async_set_callback", return_value=True
level_controllable_cover_device, "_request", return_value=True
) as set_callback:
await hass.services.async_call(
cover.DOMAIN,
@@ -115,7 +124,7 @@ async def test_cover(hass):
blocking=True,
)
await hass.async_block_till_done()
set_callback.assert_called_with("/lights/1/state", {"bri_inc": 0})
set_callback.assert_called_with("put", "/lights/1/state", json={"bri_inc": 0})
await gateway.async_reset()
+8 -6
View File
@@ -51,8 +51,12 @@ async def setup_deconz_integration(hass, config, options, get_state_response):
entry_id="1",
)
for resource in ("groups", "lights", "sensors"):
if resource not in get_state_response:
get_state_response[resource] = {}
with patch(
"pydeconz.DeconzSession.async_get_state", return_value=get_state_response
"pydeconz.DeconzSession.request", return_value=get_state_response
), patch("pydeconz.DeconzSession.start", return_value=True):
await deconz.async_setup_entry(hass, config_entry)
await hass.async_block_till_done()
@@ -172,15 +176,14 @@ async def test_reset_after_successful_setup(hass):
async def test_get_gateway(hass):
"""Successful call."""
with patch("pydeconz.DeconzSession.async_load_parameters", return_value=True):
with patch("pydeconz.DeconzSession.initialize", return_value=True):
assert await deconz.gateway.get_gateway(hass, ENTRY_CONFIG, Mock(), Mock())
async def test_get_gateway_fails_unauthorized(hass):
"""Failed call."""
with patch(
"pydeconz.DeconzSession.async_load_parameters",
side_effect=pydeconz.errors.Unauthorized,
"pydeconz.DeconzSession.initialize", side_effect=pydeconz.errors.Unauthorized,
), pytest.raises(deconz.errors.AuthenticationRequired):
assert (
await deconz.gateway.get_gateway(hass, ENTRY_CONFIG, Mock(), Mock())
@@ -191,8 +194,7 @@ async def test_get_gateway_fails_unauthorized(hass):
async def test_get_gateway_fails_cannot_connect(hass):
"""Failed call."""
with patch(
"pydeconz.DeconzSession.async_load_parameters",
side_effect=pydeconz.errors.RequestError,
"pydeconz.DeconzSession.initialize", side_effect=pydeconz.errors.RequestError,
), pytest.raises(deconz.errors.CannotConnect):
assert (
await deconz.gateway.get_gateway(hass, ENTRY_CONFIG, Mock(), Mock())
+2 -2
View File
@@ -41,7 +41,7 @@ async def test_setup_entry_fails(hass):
deconz.config_flow.CONF_PORT: ENTRY1_PORT,
deconz.config_flow.CONF_API_KEY: ENTRY1_API_KEY,
}
with patch("pydeconz.DeconzSession.async_load_parameters", side_effect=Exception):
with patch("pydeconz.DeconzSession.initialize", side_effect=Exception):
await deconz.async_setup_entry(hass, entry)
@@ -54,7 +54,7 @@ async def test_setup_entry_no_available_bridge(hass):
deconz.config_flow.CONF_API_KEY: ENTRY1_API_KEY,
}
with patch(
"pydeconz.DeconzSession.async_load_parameters", side_effect=asyncio.TimeoutError
"pydeconz.DeconzSession.initialize", side_effect=asyncio.TimeoutError
), pytest.raises(ConfigEntryNotReady):
await deconz.async_setup_entry(hass, entry)
+24 -19
View File
@@ -117,17 +117,22 @@ async def test_lights_and_groups(hass):
empty_group = hass.states.get("light.empty_group")
assert empty_group is None
rgb_light_device = gateway.api.lights["1"]
rgb_light_device.async_update({"state": {"on": False}})
state_changed_event = {
"t": "event",
"e": "changed",
"r": "lights",
"id": "1",
"state": {"on": False},
}
gateway.api.async_event_handler(state_changed_event)
await hass.async_block_till_done()
rgb_light = hass.states.get("light.rgb_light")
assert rgb_light.state == "off"
with patch.object(
rgb_light_device, "_async_set_callback", return_value=True
) as set_callback:
rgb_light_device = gateway.api.lights["1"]
with patch.object(rgb_light_device, "_request", return_value=True) as set_callback:
await hass.services.async_call(
light.DOMAIN,
light.SERVICE_TURN_ON,
@@ -143,8 +148,9 @@ async def test_lights_and_groups(hass):
)
await hass.async_block_till_done()
set_callback.assert_called_with(
"put",
"/lights/1/state",
{
json={
"ct": 2500,
"bri": 200,
"transitiontime": 50,
@@ -153,9 +159,7 @@ async def test_lights_and_groups(hass):
},
)
with patch.object(
rgb_light_device, "_async_set_callback", return_value=True
) as set_callback:
with patch.object(rgb_light_device, "_request", return_value=True) as set_callback:
await hass.services.async_call(
light.DOMAIN,
light.SERVICE_TURN_ON,
@@ -169,13 +173,12 @@ async def test_lights_and_groups(hass):
)
await hass.async_block_till_done()
set_callback.assert_called_with(
"put",
"/lights/1/state",
{"xy": (0.411, 0.351), "alert": "lselect", "effect": "none"},
json={"xy": (0.411, 0.351), "alert": "lselect", "effect": "none"},
)
with patch.object(
rgb_light_device, "_async_set_callback", return_value=True
) as set_callback:
with patch.object(rgb_light_device, "_request", return_value=True) as set_callback:
await hass.services.async_call(
light.DOMAIN,
light.SERVICE_TURN_OFF,
@@ -184,12 +187,12 @@ async def test_lights_and_groups(hass):
)
await hass.async_block_till_done()
set_callback.assert_called_with(
"/lights/1/state", {"bri": 0, "transitiontime": 50, "alert": "select"}
"put",
"/lights/1/state",
json={"bri": 0, "transitiontime": 50, "alert": "select"},
)
with patch.object(
rgb_light_device, "_async_set_callback", return_value=True
) as set_callback:
with patch.object(rgb_light_device, "_request", return_value=True) as set_callback:
await hass.services.async_call(
light.DOMAIN,
light.SERVICE_TURN_OFF,
@@ -197,7 +200,9 @@ async def test_lights_and_groups(hass):
blocking=True,
)
await hass.async_block_till_done()
set_callback.assert_called_with("/lights/1/state", {"alert": "lselect"})
set_callback.assert_called_with(
"put", "/lights/1/state", json={"alert": "lselect"}
)
await gateway.async_reset()
+2 -4
View File
@@ -60,14 +60,12 @@ async def test_scenes(hass):
group_scene = gateway.api.groups["1"].scenes["1"]
with patch.object(
group_scene, "_async_set_state_callback", return_value=True
) as set_callback:
with patch.object(group_scene, "_request", return_value=True) as set_callback:
await hass.services.async_call(
"scene", "turn_on", {"entity_id": "scene.light_group_scene"}, blocking=True
)
await hass.async_block_till_done()
set_callback.assert_called_with("/groups/1/scenes/1/recall", {})
set_callback.assert_called_with("put", "/groups/1/scenes/1/recall", json={})
await gateway.async_reset()
+19 -4
View File
@@ -143,8 +143,23 @@ async def test_sensors(hass):
consumption_sensor = hass.states.get("sensor.consumption_sensor")
assert consumption_sensor.state == "0.002"
gateway.api.sensors["1"].async_update({"state": {"lightlevel": 2000}})
gateway.api.sensors["4"].async_update({"config": {"battery": 75}})
state_changed_event = {
"t": "event",
"e": "changed",
"r": "sensors",
"id": "1",
"state": {"lightlevel": 2000},
}
gateway.api.async_event_handler(state_changed_event)
state_changed_event = {
"t": "event",
"e": "changed",
"r": "sensors",
"id": "4",
"config": {"battery": 75},
}
gateway.api.async_event_handler(state_changed_event)
await hass.async_block_till_done()
light_level_sensor = hass.states.get("sensor.light_level_sensor")
@@ -219,14 +234,14 @@ async def test_add_new_sensor(hass):
)
assert len(gateway.deconz_ids) == 0
state_added = {
state_added_event = {
"t": "event",
"e": "added",
"r": "sensors",
"id": "1",
"sensor": deepcopy(SENSORS["1"]),
}
gateway.api.async_event_handler(state_added)
gateway.api.async_event_handler(state_added_event)
await hass.async_block_till_done()
assert "sensor.light_level_sensor" in gateway.deconz_ids
+12 -16
View File
@@ -104,14 +104,14 @@ async def test_configure_service_with_field(hass):
deconz.services.SERVICE_DATA: {"on": True, "attr1": 10, "attr2": 20},
}
with patch(
"pydeconz.DeconzSession.async_put_state", return_value=Mock(True)
) as put_state:
with patch("pydeconz.DeconzSession.request", return_value=Mock(True)) as put_state:
await hass.services.async_call(
deconz.DOMAIN, deconz.services.SERVICE_CONFIGURE_DEVICE, service_data=data
)
await hass.async_block_till_done()
put_state.assert_called_with("/light/2", {"on": True, "attr1": 10, "attr2": 20})
put_state.assert_called_with(
"put", "/light/2", json={"on": True, "attr1": 10, "attr2": 20}
)
async def test_configure_service_with_entity(hass):
@@ -127,14 +127,14 @@ async def test_configure_service_with_entity(hass):
deconz.services.SERVICE_DATA: {"on": True, "attr1": 10, "attr2": 20},
}
with patch(
"pydeconz.DeconzSession.async_put_state", return_value=Mock(True)
) as put_state:
with patch("pydeconz.DeconzSession.request", return_value=Mock(True)) as put_state:
await hass.services.async_call(
deconz.DOMAIN, deconz.services.SERVICE_CONFIGURE_DEVICE, service_data=data
)
await hass.async_block_till_done()
put_state.assert_called_with("/light/1", {"on": True, "attr1": 10, "attr2": 20})
put_state.assert_called_with(
"put", "/light/1", json={"on": True, "attr1": 10, "attr2": 20}
)
async def test_configure_service_with_entity_and_field(hass):
@@ -151,15 +151,13 @@ async def test_configure_service_with_entity_and_field(hass):
deconz.services.SERVICE_DATA: {"on": True, "attr1": 10, "attr2": 20},
}
with patch(
"pydeconz.DeconzSession.async_put_state", return_value=Mock(True)
) as put_state:
with patch("pydeconz.DeconzSession.request", return_value=Mock(True)) as put_state:
await hass.services.async_call(
deconz.DOMAIN, deconz.services.SERVICE_CONFIGURE_DEVICE, service_data=data
)
await hass.async_block_till_done()
put_state.assert_called_with(
"/light/1/state", {"on": True, "attr1": 10, "attr2": 20}
"put", "/light/1/state", json={"on": True, "attr1": 10, "attr2": 20}
)
@@ -191,9 +189,7 @@ async def test_configure_service_with_faulty_entity(hass):
deconz.services.SERVICE_DATA: {},
}
with patch(
"pydeconz.DeconzSession.async_put_state", return_value=Mock(True)
) as put_state:
with patch("pydeconz.DeconzSession.request", return_value=Mock(True)) as put_state:
await hass.services.async_call(
deconz.DOMAIN, deconz.services.SERVICE_CONFIGURE_DEVICE, service_data=data
)
@@ -211,7 +207,7 @@ async def test_service_refresh_devices(hass):
data = {deconz.CONF_BRIDGEID: BRIDGEID}
with patch(
"pydeconz.DeconzSession.async_get_state",
"pydeconz.DeconzSession.request",
return_value={"groups": GROUP, "lights": LIGHT, "sensors": SENSOR},
):
await hass.services.async_call(
+32 -13
View File
@@ -85,11 +85,22 @@ async def test_switches(hass):
warning_device = hass.states.get("switch.warning_device")
assert warning_device.state == "on"
on_off_switch_device = gateway.api.lights["1"]
warning_device_device = gateway.api.lights["3"]
on_off_switch_device.async_update({"state": {"on": False}})
warning_device_device.async_update({"state": {"alert": None}})
state_changed_event = {
"t": "event",
"e": "changed",
"r": "lights",
"id": "1",
"state": {"on": False},
}
gateway.api.async_event_handler(state_changed_event)
state_changed_event = {
"t": "event",
"e": "changed",
"r": "lights",
"id": "3",
"state": {"alert": None},
}
gateway.api.async_event_handler(state_changed_event)
await hass.async_block_till_done()
on_off_switch = hass.states.get("switch.on_off_switch")
@@ -98,8 +109,10 @@ async def test_switches(hass):
warning_device = hass.states.get("switch.warning_device")
assert warning_device.state == "off"
on_off_switch_device = gateway.api.lights["1"]
with patch.object(
on_off_switch_device, "_async_set_callback", return_value=True
on_off_switch_device, "_request", return_value=True
) as set_callback:
await hass.services.async_call(
switch.DOMAIN,
@@ -108,10 +121,10 @@ async def test_switches(hass):
blocking=True,
)
await hass.async_block_till_done()
set_callback.assert_called_with("/lights/1/state", {"on": True})
set_callback.assert_called_with("put", "/lights/1/state", json={"on": True})
with patch.object(
on_off_switch_device, "_async_set_callback", return_value=True
on_off_switch_device, "_request", return_value=True
) as set_callback:
await hass.services.async_call(
switch.DOMAIN,
@@ -120,10 +133,12 @@ async def test_switches(hass):
blocking=True,
)
await hass.async_block_till_done()
set_callback.assert_called_with("/lights/1/state", {"on": False})
set_callback.assert_called_with("put", "/lights/1/state", json={"on": False})
warning_device_device = gateway.api.lights["3"]
with patch.object(
warning_device_device, "_async_set_callback", return_value=True
warning_device_device, "_request", return_value=True
) as set_callback:
await hass.services.async_call(
switch.DOMAIN,
@@ -132,10 +147,12 @@ async def test_switches(hass):
blocking=True,
)
await hass.async_block_till_done()
set_callback.assert_called_with("/lights/3/state", {"alert": "lselect"})
set_callback.assert_called_with(
"put", "/lights/3/state", json={"alert": "lselect"}
)
with patch.object(
warning_device_device, "_async_set_callback", return_value=True
warning_device_device, "_request", return_value=True
) as set_callback:
await hass.services.async_call(
switch.DOMAIN,
@@ -144,7 +161,9 @@ async def test_switches(hass):
blocking=True,
)
await hass.async_block_till_done()
set_callback.assert_called_with("/lights/3/state", {"alert": "none"})
set_callback.assert_called_with(
"put", "/lights/3/state", json={"alert": "none"}
)
await gateway.async_reset()