Black
This commit is contained in:
parent
da05dfe708
commit
4de97abc3a
2676 changed files with 163166 additions and 140084 deletions
|
@ -21,18 +21,17 @@ def manager():
|
|||
raise data_entry_flow.UnknownHandler
|
||||
|
||||
flow = handler()
|
||||
flow.init_step = context.get('init_step', 'init')
|
||||
flow.source = context.get('source')
|
||||
flow.init_step = context.get("init_step", "init")
|
||||
flow.source = context.get("source")
|
||||
return flow
|
||||
|
||||
async def async_add_entry(flow, result):
|
||||
if result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY:
|
||||
result['source'] = flow.context.get('source')
|
||||
if result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY:
|
||||
result["source"] = flow.context.get("source")
|
||||
entries.append(result)
|
||||
return result
|
||||
|
||||
manager = data_entry_flow.FlowManager(
|
||||
None, async_create_flow, async_add_entry)
|
||||
manager = data_entry_flow.FlowManager(None, async_create_flow, async_add_entry)
|
||||
manager.mock_created_entries = entries
|
||||
manager.mock_reg_handler = handlers.register
|
||||
return manager
|
||||
|
@ -40,27 +39,29 @@ def manager():
|
|||
|
||||
async def test_configure_reuses_handler_instance(manager):
|
||||
"""Test that we reuse instances."""
|
||||
@manager.mock_reg_handler('test')
|
||||
|
||||
@manager.mock_reg_handler("test")
|
||||
class TestFlow(data_entry_flow.FlowHandler):
|
||||
handle_count = 0
|
||||
|
||||
async def async_step_init(self, user_input=None):
|
||||
self.handle_count += 1
|
||||
return self.async_show_form(
|
||||
errors={'base': str(self.handle_count)},
|
||||
step_id='init')
|
||||
errors={"base": str(self.handle_count)}, step_id="init"
|
||||
)
|
||||
|
||||
form = await manager.async_init('test')
|
||||
assert form['errors']['base'] == '1'
|
||||
form = await manager.async_configure(form['flow_id'])
|
||||
assert form['errors']['base'] == '2'
|
||||
form = await manager.async_init("test")
|
||||
assert form["errors"]["base"] == "1"
|
||||
form = await manager.async_configure(form["flow_id"])
|
||||
assert form["errors"]["base"] == "2"
|
||||
assert len(manager.async_progress()) == 1
|
||||
assert len(manager.mock_created_entries) == 0
|
||||
|
||||
|
||||
async def test_configure_two_steps(manager):
|
||||
"""Test that we reuse instances."""
|
||||
@manager.mock_reg_handler('test')
|
||||
|
||||
@manager.mock_reg_handler("test")
|
||||
class TestFlow(data_entry_flow.FlowHandler):
|
||||
VERSION = 1
|
||||
|
||||
|
@ -68,69 +69,53 @@ async def test_configure_two_steps(manager):
|
|||
if user_input is not None:
|
||||
self.init_data = user_input
|
||||
return await self.async_step_second()
|
||||
return self.async_show_form(
|
||||
step_id='first',
|
||||
data_schema=vol.Schema([str])
|
||||
)
|
||||
return self.async_show_form(step_id="first", data_schema=vol.Schema([str]))
|
||||
|
||||
async def async_step_second(self, user_input=None):
|
||||
if user_input is not None:
|
||||
return self.async_create_entry(
|
||||
title='Test Entry',
|
||||
data=self.init_data + user_input
|
||||
title="Test Entry", data=self.init_data + user_input
|
||||
)
|
||||
return self.async_show_form(
|
||||
step_id='second',
|
||||
data_schema=vol.Schema([str])
|
||||
)
|
||||
return self.async_show_form(step_id="second", data_schema=vol.Schema([str]))
|
||||
|
||||
form = await manager.async_init('test', context={'init_step': 'first'})
|
||||
form = await manager.async_init("test", context={"init_step": "first"})
|
||||
|
||||
with pytest.raises(vol.Invalid):
|
||||
form = await manager.async_configure(
|
||||
form['flow_id'], 'INCORRECT-DATA')
|
||||
form = await manager.async_configure(form["flow_id"], "INCORRECT-DATA")
|
||||
|
||||
form = await manager.async_configure(
|
||||
form['flow_id'], ['INIT-DATA'])
|
||||
form = await manager.async_configure(
|
||||
form['flow_id'], ['SECOND-DATA'])
|
||||
assert form['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
form = await manager.async_configure(form["flow_id"], ["INIT-DATA"])
|
||||
form = await manager.async_configure(form["flow_id"], ["SECOND-DATA"])
|
||||
assert form["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
assert len(manager.async_progress()) == 0
|
||||
assert len(manager.mock_created_entries) == 1
|
||||
result = manager.mock_created_entries[0]
|
||||
assert result['handler'] == 'test'
|
||||
assert result['data'] == ['INIT-DATA', 'SECOND-DATA']
|
||||
assert result["handler"] == "test"
|
||||
assert result["data"] == ["INIT-DATA", "SECOND-DATA"]
|
||||
|
||||
|
||||
async def test_show_form(manager):
|
||||
"""Test that abort removes the flow from progress."""
|
||||
schema = vol.Schema({
|
||||
vol.Required('username'): str,
|
||||
vol.Required('password'): str
|
||||
})
|
||||
schema = vol.Schema({vol.Required("username"): str, vol.Required("password"): str})
|
||||
|
||||
@manager.mock_reg_handler('test')
|
||||
@manager.mock_reg_handler("test")
|
||||
class TestFlow(data_entry_flow.FlowHandler):
|
||||
async def async_step_init(self, user_input=None):
|
||||
return self.async_show_form(
|
||||
step_id='init',
|
||||
step_id="init",
|
||||
data_schema=schema,
|
||||
errors={
|
||||
'username': 'Should be unique.'
|
||||
}
|
||||
errors={"username": "Should be unique."},
|
||||
)
|
||||
|
||||
form = await manager.async_init('test')
|
||||
assert form['type'] == 'form'
|
||||
assert form['data_schema'] is schema
|
||||
assert form['errors'] == {
|
||||
'username': 'Should be unique.'
|
||||
}
|
||||
form = await manager.async_init("test")
|
||||
assert form["type"] == "form"
|
||||
assert form["data_schema"] is schema
|
||||
assert form["errors"] == {"username": "Should be unique."}
|
||||
|
||||
|
||||
async def test_abort_removes_instance(manager):
|
||||
"""Test that abort removes the flow from progress."""
|
||||
@manager.mock_reg_handler('test')
|
||||
|
||||
@manager.mock_reg_handler("test")
|
||||
class TestFlow(data_entry_flow.FlowHandler):
|
||||
is_new = True
|
||||
|
||||
|
@ -139,79 +124,75 @@ async def test_abort_removes_instance(manager):
|
|||
self.is_new = False
|
||||
return self.async_abort(reason=str(old))
|
||||
|
||||
form = await manager.async_init('test')
|
||||
assert form['reason'] == 'True'
|
||||
form = await manager.async_init("test")
|
||||
assert form["reason"] == "True"
|
||||
assert len(manager.async_progress()) == 0
|
||||
assert len(manager.mock_created_entries) == 0
|
||||
form = await manager.async_init('test')
|
||||
assert form['reason'] == 'True'
|
||||
form = await manager.async_init("test")
|
||||
assert form["reason"] == "True"
|
||||
assert len(manager.async_progress()) == 0
|
||||
assert len(manager.mock_created_entries) == 0
|
||||
|
||||
|
||||
async def test_create_saves_data(manager):
|
||||
"""Test creating a config entry."""
|
||||
@manager.mock_reg_handler('test')
|
||||
|
||||
@manager.mock_reg_handler("test")
|
||||
class TestFlow(data_entry_flow.FlowHandler):
|
||||
VERSION = 5
|
||||
|
||||
async def async_step_init(self, user_input=None):
|
||||
return self.async_create_entry(
|
||||
title='Test Title',
|
||||
data='Test Data'
|
||||
)
|
||||
return self.async_create_entry(title="Test Title", data="Test Data")
|
||||
|
||||
await manager.async_init('test')
|
||||
await manager.async_init("test")
|
||||
assert len(manager.async_progress()) == 0
|
||||
assert len(manager.mock_created_entries) == 1
|
||||
|
||||
entry = manager.mock_created_entries[0]
|
||||
assert entry['version'] == 5
|
||||
assert entry['handler'] == 'test'
|
||||
assert entry['title'] == 'Test Title'
|
||||
assert entry['data'] == 'Test Data'
|
||||
assert entry['source'] is None
|
||||
assert entry["version"] == 5
|
||||
assert entry["handler"] == "test"
|
||||
assert entry["title"] == "Test Title"
|
||||
assert entry["data"] == "Test Data"
|
||||
assert entry["source"] is None
|
||||
|
||||
|
||||
async def test_discovery_init_flow(manager):
|
||||
"""Test a flow initialized by discovery."""
|
||||
@manager.mock_reg_handler('test')
|
||||
|
||||
@manager.mock_reg_handler("test")
|
||||
class TestFlow(data_entry_flow.FlowHandler):
|
||||
VERSION = 5
|
||||
|
||||
async def async_step_init(self, info):
|
||||
return self.async_create_entry(title=info['id'], data=info)
|
||||
return self.async_create_entry(title=info["id"], data=info)
|
||||
|
||||
data = {
|
||||
'id': 'hello',
|
||||
'token': 'secret'
|
||||
}
|
||||
data = {"id": "hello", "token": "secret"}
|
||||
|
||||
await manager.async_init(
|
||||
'test', context={'source': 'discovery'}, data=data)
|
||||
await manager.async_init("test", context={"source": "discovery"}, data=data)
|
||||
assert len(manager.async_progress()) == 0
|
||||
assert len(manager.mock_created_entries) == 1
|
||||
|
||||
entry = manager.mock_created_entries[0]
|
||||
assert entry['version'] == 5
|
||||
assert entry['handler'] == 'test'
|
||||
assert entry['title'] == 'hello'
|
||||
assert entry['data'] == data
|
||||
assert entry['source'] == 'discovery'
|
||||
assert entry["version"] == 5
|
||||
assert entry["handler"] == "test"
|
||||
assert entry["title"] == "hello"
|
||||
assert entry["data"] == data
|
||||
assert entry["source"] == "discovery"
|
||||
|
||||
|
||||
async def test_finish_callback_change_result_type(hass):
|
||||
"""Test finish callback can change result type."""
|
||||
|
||||
class TestFlow(data_entry_flow.FlowHandler):
|
||||
VERSION = 1
|
||||
|
||||
async def async_step_init(self, input):
|
||||
"""Return init form with one input field 'count'."""
|
||||
if input is not None:
|
||||
return self.async_create_entry(title='init', data=input)
|
||||
return self.async_create_entry(title="init", data=input)
|
||||
return self.async_show_form(
|
||||
step_id='init',
|
||||
data_schema=vol.Schema({'count': int}))
|
||||
step_id="init", data_schema=vol.Schema({"count": int})
|
||||
)
|
||||
|
||||
async def async_create_flow(handler_name, *, context, data):
|
||||
"""Create a test flow."""
|
||||
|
@ -219,38 +200,36 @@ async def test_finish_callback_change_result_type(hass):
|
|||
|
||||
async def async_finish_flow(flow, result):
|
||||
"""Redirect to init form if count <= 1."""
|
||||
if result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY:
|
||||
if (result['data'] is None or
|
||||
result['data'].get('count', 0) <= 1):
|
||||
if result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY:
|
||||
if result["data"] is None or result["data"].get("count", 0) <= 1:
|
||||
return flow.async_show_form(
|
||||
step_id='init',
|
||||
data_schema=vol.Schema({'count': int}))
|
||||
step_id="init", data_schema=vol.Schema({"count": int})
|
||||
)
|
||||
else:
|
||||
result['result'] = result['data']['count']
|
||||
result["result"] = result["data"]["count"]
|
||||
return result
|
||||
|
||||
manager = data_entry_flow.FlowManager(
|
||||
hass, async_create_flow, async_finish_flow)
|
||||
manager = data_entry_flow.FlowManager(hass, async_create_flow, async_finish_flow)
|
||||
|
||||
result = await manager.async_init('test')
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
|
||||
assert result['step_id'] == 'init'
|
||||
result = await manager.async_init("test")
|
||||
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
|
||||
assert result["step_id"] == "init"
|
||||
|
||||
result = await manager.async_configure(result['flow_id'], {'count': 0})
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
|
||||
assert result['step_id'] == 'init'
|
||||
assert 'result' not in result
|
||||
result = await manager.async_configure(result["flow_id"], {"count": 0})
|
||||
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
|
||||
assert result["step_id"] == "init"
|
||||
assert "result" not in result
|
||||
|
||||
result = await manager.async_configure(result['flow_id'], {'count': 2})
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
assert result['result'] == 2
|
||||
result = await manager.async_configure(result["flow_id"], {"count": 2})
|
||||
assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
assert result["result"] == 2
|
||||
|
||||
|
||||
async def test_external_step(hass, manager):
|
||||
"""Test external step logic."""
|
||||
manager.hass = hass
|
||||
|
||||
@manager.mock_reg_handler('test')
|
||||
@manager.mock_reg_handler("test")
|
||||
class TestFlow(data_entry_flow.FlowHandler):
|
||||
VERSION = 5
|
||||
data = None
|
||||
|
@ -258,43 +237,37 @@ async def test_external_step(hass, manager):
|
|||
async def async_step_init(self, user_input=None):
|
||||
if not user_input:
|
||||
return self.async_external_step(
|
||||
step_id='init',
|
||||
url='https://example.com',
|
||||
step_id="init", url="https://example.com"
|
||||
)
|
||||
|
||||
self.data = user_input
|
||||
return self.async_external_step_done(next_step_id='finish')
|
||||
return self.async_external_step_done(next_step_id="finish")
|
||||
|
||||
async def async_step_finish(self, user_input=None):
|
||||
return self.async_create_entry(
|
||||
title=self.data['title'],
|
||||
data=self.data
|
||||
)
|
||||
return self.async_create_entry(title=self.data["title"], data=self.data)
|
||||
|
||||
events = async_capture_events(
|
||||
hass, data_entry_flow.EVENT_DATA_ENTRY_FLOW_PROGRESSED
|
||||
)
|
||||
|
||||
result = await manager.async_init('test')
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_EXTERNAL_STEP
|
||||
result = await manager.async_init("test")
|
||||
assert result["type"] == data_entry_flow.RESULT_TYPE_EXTERNAL_STEP
|
||||
assert len(manager.async_progress()) == 1
|
||||
|
||||
# Mimic external step
|
||||
# Called by integrations: `hass.config_entries.flow.async_configure(…)`
|
||||
result = await manager.async_configure(result['flow_id'], {
|
||||
'title': 'Hello'
|
||||
})
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_EXTERNAL_STEP_DONE
|
||||
result = await manager.async_configure(result["flow_id"], {"title": "Hello"})
|
||||
assert result["type"] == data_entry_flow.RESULT_TYPE_EXTERNAL_STEP_DONE
|
||||
|
||||
await hass.async_block_till_done()
|
||||
assert len(events) == 1
|
||||
assert events[0].data == {
|
||||
'handler': 'test',
|
||||
'flow_id': result['flow_id'],
|
||||
'refresh': True
|
||||
"handler": "test",
|
||||
"flow_id": result["flow_id"],
|
||||
"refresh": True,
|
||||
}
|
||||
|
||||
# Frontend refreshses the flow
|
||||
result = await manager.async_configure(result['flow_id'])
|
||||
assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
assert result['title'] == "Hello"
|
||||
result = await manager.async_configure(result["flow_id"])
|
||||
assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
assert result["title"] == "Hello"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue