Custom component loading cleanup (#14211)
* Clean up custom component loading * Fix some tests * Fix some stuff * Make imports work again * Fix tests * Remove debug print * Lint
This commit is contained in:
1 parent
5d96751168
commit
83d300fd11
50 files changed
+315
-392
No files matched your search
@@ -10,8 +10,6 @@ import voluptuous as vol
|
||||
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
|
||||
from tests.common import get_test_home_assistant
|
||||
|
||||
|
||||
def test_boolean():
|
||||
"""Test boolean validation."""
|
||||
@@ -256,24 +254,6 @@ def test_event_schema():
|
||||
cv.EVENT_SCHEMA(value)
|
||||
|
||||
|
||||
def test_platform_validator():
|
||||
"""Test platform validation."""
|
||||
hass = None
|
||||
|
||||
try:
|
||||
hass = get_test_home_assistant()
|
||||
|
||||
schema = vol.Schema(cv.platform_validator('light'))
|
||||
|
||||
with pytest.raises(vol.MultipleInvalid):
|
||||
schema('platform_that_does_not_exist')
|
||||
|
||||
schema('hue')
|
||||
finally:
|
||||
if hass is not None:
|
||||
hass.stop()
|
||||
|
||||
|
||||
def test_icon():
|
||||
"""Test icon validation."""
|
||||
schema = vol.Schema(cv.icon)
|
||||
|
||||
@@ -129,11 +129,11 @@ class TestHelpersDiscovery:
|
||||
platform_calls.append('disc' if discovery_info else 'component')
|
||||
|
||||
loader.set_component(
|
||||
'test_component',
|
||||
self.hass, 'test_component',
|
||||
MockModule('test_component', setup=component_setup))
|
||||
|
||||
loader.set_component(
|
||||
'switch.test_circular',
|
||||
self.hass, 'switch.test_circular',
|
||||
MockPlatform(setup_platform,
|
||||
dependencies=['test_component']))
|
||||
|
||||
@@ -177,11 +177,11 @@ class TestHelpersDiscovery:
|
||||
return True
|
||||
|
||||
loader.set_component(
|
||||
'test_component1',
|
||||
self.hass, 'test_component1',
|
||||
MockModule('test_component1', setup=component1_setup))
|
||||
|
||||
loader.set_component(
|
||||
'test_component2',
|
||||
self.hass, 'test_component2',
|
||||
MockModule('test_component2', setup=component2_setup))
|
||||
|
||||
@callback
|
||||
|
||||
@@ -75,9 +75,9 @@ class TestHelpersEntityComponent(unittest.TestCase):
|
||||
component_setup = Mock(return_value=True)
|
||||
platform_setup = Mock(return_value=None)
|
||||
loader.set_component(
|
||||
'test_component',
|
||||
self.hass, 'test_component',
|
||||
MockModule('test_component', setup=component_setup))
|
||||
loader.set_component('test_domain.mod2',
|
||||
loader.set_component(self.hass, 'test_domain.mod2',
|
||||
MockPlatform(platform_setup, ['test_component']))
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, self.hass)
|
||||
@@ -100,8 +100,10 @@ class TestHelpersEntityComponent(unittest.TestCase):
|
||||
platform1_setup = Mock(side_effect=Exception('Broken'))
|
||||
platform2_setup = Mock(return_value=None)
|
||||
|
||||
loader.set_component('test_domain.mod1', MockPlatform(platform1_setup))
|
||||
loader.set_component('test_domain.mod2', MockPlatform(platform2_setup))
|
||||
loader.set_component(self.hass, 'test_domain.mod1',
|
||||
MockPlatform(platform1_setup))
|
||||
loader.set_component(self.hass, 'test_domain.mod2',
|
||||
MockPlatform(platform2_setup))
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, self.hass)
|
||||
|
||||
@@ -145,7 +147,7 @@ class TestHelpersEntityComponent(unittest.TestCase):
|
||||
"""Test the platform setup."""
|
||||
add_devices([MockEntity(should_poll=True)])
|
||||
|
||||
loader.set_component('test_domain.platform',
|
||||
loader.set_component(self.hass, 'test_domain.platform',
|
||||
MockPlatform(platform_setup))
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, self.hass)
|
||||
@@ -172,7 +174,7 @@ class TestHelpersEntityComponent(unittest.TestCase):
|
||||
|
||||
platform = MockPlatform(platform_setup)
|
||||
|
||||
loader.set_component('test_domain.platform', platform)
|
||||
loader.set_component(self.hass, 'test_domain.platform', platform)
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, self.hass)
|
||||
|
||||
@@ -220,7 +222,8 @@ def test_platform_not_ready(hass):
|
||||
"""Test that we retry when platform not ready."""
|
||||
platform1_setup = Mock(side_effect=[PlatformNotReady, PlatformNotReady,
|
||||
None])
|
||||
loader.set_component('test_domain.mod1', MockPlatform(platform1_setup))
|
||||
loader.set_component(hass, 'test_domain.mod1',
|
||||
MockPlatform(platform1_setup))
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, hass)
|
||||
|
||||
@@ -316,10 +319,11 @@ def test_setup_dependencies_platform(hass):
|
||||
We're explictely testing that we process dependencies even if a component
|
||||
with the same name has already been loaded.
|
||||
"""
|
||||
loader.set_component('test_component', MockModule('test_component'))
|
||||
loader.set_component('test_component2', MockModule('test_component2'))
|
||||
loader.set_component(hass, 'test_component', MockModule('test_component'))
|
||||
loader.set_component(hass, 'test_component2',
|
||||
MockModule('test_component2'))
|
||||
loader.set_component(
|
||||
'test_domain.test_component',
|
||||
hass, 'test_domain.test_component',
|
||||
MockPlatform(dependencies=['test_component', 'test_component2']))
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, hass)
|
||||
@@ -341,7 +345,7 @@ async def test_setup_entry(hass):
|
||||
"""Test setup entry calls async_setup_entry on platform."""
|
||||
mock_setup_entry = Mock(return_value=mock_coro(True))
|
||||
loader.set_component(
|
||||
'test_domain.entry_domain',
|
||||
hass, 'test_domain.entry_domain',
|
||||
MockPlatform(async_setup_entry=mock_setup_entry))
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, hass)
|
||||
@@ -366,7 +370,7 @@ async def test_setup_entry_fails_duplicate(hass):
|
||||
"""Test we don't allow setting up a config entry twice."""
|
||||
mock_setup_entry = Mock(return_value=mock_coro(True))
|
||||
loader.set_component(
|
||||
'test_domain.entry_domain',
|
||||
hass, 'test_domain.entry_domain',
|
||||
MockPlatform(async_setup_entry=mock_setup_entry))
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, hass)
|
||||
@@ -382,7 +386,7 @@ async def test_unload_entry_resets_platform(hass):
|
||||
"""Test unloading an entry removes all entities."""
|
||||
mock_setup_entry = Mock(return_value=mock_coro(True))
|
||||
loader.set_component(
|
||||
'test_domain.entry_domain',
|
||||
hass, 'test_domain.entry_domain',
|
||||
MockPlatform(async_setup_entry=mock_setup_entry))
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, hass)
|
||||
|
||||
@@ -147,7 +147,7 @@ class TestHelpersEntityPlatform(unittest.TestCase):
|
||||
platform = MockPlatform(platform_setup)
|
||||
platform.SCAN_INTERVAL = timedelta(seconds=30)
|
||||
|
||||
loader.set_component('test_domain.platform', platform)
|
||||
loader.set_component(self.hass, 'test_domain.platform', platform)
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, self.hass)
|
||||
|
||||
@@ -184,7 +184,7 @@ def test_platform_warn_slow_setup(hass):
|
||||
"""Warn we log when platform setup takes a long time."""
|
||||
platform = MockPlatform()
|
||||
|
||||
loader.set_component('test_domain.platform', platform)
|
||||
loader.set_component(hass, 'test_domain.platform', platform)
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, hass)
|
||||
|
||||
@@ -218,7 +218,7 @@ def test_platform_error_slow_setup(hass, caplog):
|
||||
|
||||
platform = MockPlatform(async_setup_platform=setup_platform)
|
||||
component = EntityComponent(_LOGGER, DOMAIN, hass)
|
||||
loader.set_component('test_domain.test_platform', platform)
|
||||
loader.set_component(hass, 'test_domain.test_platform', platform)
|
||||
yield from component.async_setup({
|
||||
DOMAIN: {
|
||||
'platform': 'test_platform',
|
||||
@@ -260,7 +260,7 @@ def test_parallel_updates_async_platform(hass):
|
||||
|
||||
platform.async_setup_platform = mock_update
|
||||
|
||||
loader.set_component('test_domain.platform', platform)
|
||||
loader.set_component(hass, 'test_domain.platform', platform)
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, hass)
|
||||
component._platforms = {}
|
||||
@@ -288,7 +288,7 @@ def test_parallel_updates_async_platform_with_constant(hass):
|
||||
platform.async_setup_platform = mock_update
|
||||
platform.PARALLEL_UPDATES = 1
|
||||
|
||||
loader.set_component('test_domain.platform', platform)
|
||||
loader.set_component(hass, 'test_domain.platform', platform)
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, hass)
|
||||
component._platforms = {}
|
||||
@@ -309,7 +309,7 @@ def test_parallel_updates_sync_platform(hass):
|
||||
"""Warn we log when platform setup takes a long time."""
|
||||
platform = MockPlatform(setup_platform=lambda *args: None)
|
||||
|
||||
loader.set_component('test_domain.platform', platform)
|
||||
loader.set_component(hass, 'test_domain.platform', platform)
|
||||
|
||||
component = EntityComponent(_LOGGER, DOMAIN, hass)
|
||||
component._platforms = {}
|
||||
|
||||
@@ -138,7 +138,7 @@ class TestServiceHelpers(unittest.TestCase):
|
||||
self.hass.states.set('light.Ceiling', STATE_OFF)
|
||||
self.hass.states.set('light.Kitchen', STATE_OFF)
|
||||
|
||||
loader.get_component('group').Group.create_group(
|
||||
loader.get_component(self.hass, 'group').Group.create_group(
|
||||
self.hass, 'test', ['light.Ceiling', 'light.Kitchen'])
|
||||
|
||||
call = ha.ServiceCall('light', 'turn_on',
|
||||
@@ -160,7 +160,7 @@ class TestServiceHelpers(unittest.TestCase):
|
||||
@asyncio.coroutine
|
||||
def test_async_get_all_descriptions(hass):
|
||||
"""Test async_get_all_descriptions."""
|
||||
group = loader.get_component('group')
|
||||
group = loader.get_component(hass, 'group')
|
||||
group_config = {group.DOMAIN: {}}
|
||||
yield from async_setup_component(hass, group.DOMAIN, group_config)
|
||||
descriptions = yield from service.async_get_all_descriptions(hass)
|
||||
@@ -170,7 +170,7 @@ def test_async_get_all_descriptions(hass):
|
||||
assert 'description' in descriptions['group']['reload']
|
||||
assert 'fields' in descriptions['group']['reload']
|
||||
|
||||
logger = loader.get_component('logger')
|
||||
logger = loader.get_component(hass, 'logger')
|
||||
logger_config = {logger.DOMAIN: {}}
|
||||
yield from async_setup_component(hass, logger.DOMAIN, logger_config)
|
||||
descriptions = yield from service.async_get_all_descriptions(hass)
|
||||
|
||||
@@ -50,15 +50,15 @@ async def test_component_translation_file(hass):
|
||||
})
|
||||
|
||||
assert path.normpath(translation.component_translation_file(
|
||||
'switch.test', 'en')) == path.normpath(hass.config.path(
|
||||
hass, 'switch.test', 'en')) == path.normpath(hass.config.path(
|
||||
'custom_components', 'switch', '.translations', 'test.en.json'))
|
||||
|
||||
assert path.normpath(translation.component_translation_file(
|
||||
'test_standalone', 'en')) == path.normpath(hass.config.path(
|
||||
hass, 'test_standalone', 'en')) == path.normpath(hass.config.path(
|
||||
'custom_components', '.translations', 'test_standalone.en.json'))
|
||||
|
||||
assert path.normpath(translation.component_translation_file(
|
||||
'test_package', 'en')) == path.normpath(hass.config.path(
|
||||
hass, 'test_package', 'en')) == path.normpath(hass.config.path(
|
||||
'custom_components', 'test_package', '.translations', 'en.json'))
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user