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

Split bootstrap into bs + setup (#6416)

Browse source 
* Split bootstrap into bs + setup

* Lint
This commit is contained in:
Paulus Schoutsen 2017-03-05 01:41:54 -08:00 • committed by Pascal Vizeli
parent bdf948d866
commit 2650c73a89
171 changed files with 972 additions and 959 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/helpers/test_aiohttp_client.py
View file

@ -5,7 +5,7 @@ import unittest
import aiohttp
from homeassistant.core import EVENT_HOMEASSISTANT_CLOSE
from homeassistant.bootstrap import setup_component
from homeassistant.setup import setup_component
import homeassistant.helpers.aiohttp_client as client
from homeassistant.util.async import run_callback_threadsafe

16
tests/helpers/test_discovery.py
View file

@ -4,7 +4,7 @@ from unittest.mock import patch
import pytest
from homeassistant import loader, bootstrap
from homeassistant import loader, setup
from homeassistant.core import callback
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers import discovery
@ -24,7 +24,7 @@ class TestHelpersDiscovery:
"""Stop everything that was started."""
self.hass.stop()
@patch('homeassistant.bootstrap.async_setup_component')
@patch('homeassistant.setup.async_setup_component')
def test_listen(self, mock_setup_component):
"""Test discovery listen/discover combo."""
calls_single = []
@ -63,7 +63,7 @@ class TestHelpersDiscovery:
assert ['test service', 'another service'] == [info[0] for info
in calls_multi]
@patch('homeassistant.bootstrap.async_setup_component',
@patch('homeassistant.setup.async_setup_component',
return_value=mock_coro(True))
def test_platform(self, mock_setup_component):
"""Test discover platform method."""
@ -136,7 +136,7 @@ class TestHelpersDiscovery:
MockPlatform(setup_platform,
dependencies=['test_component']))
bootstrap.setup_component(self.hass, 'test_component', {
setup.setup_component(self.hass, 'test_component', {
'test_component': None,
'switch': [{
'platform': 'test_circular',
@ -184,14 +184,14 @@ class TestHelpersDiscovery:
MockModule('test_component2', setup=component2_setup))
@callback
def setup():
def do_setup():
"""Setup 2 components."""
self.hass.async_add_job(bootstrap.async_setup_component(
self.hass.async_add_job(setup.async_setup_component(
self.hass, 'test_component1', {}))
self.hass.async_add_job(bootstrap.async_setup_component(
self.hass.async_add_job(setup.async_setup_component(
self.hass, 'test_component2', {}))
self.hass.add_job(setup)
self.hass.add_job(do_setup)
self.hass.block_till_done()
# test_component will only be setup once

2
tests/helpers/test_entity_component.py
View file

@ -301,7 +301,7 @@ class TestHelpersEntityComponent(unittest.TestCase):
@patch('homeassistant.helpers.entity_component.EntityComponent'
'._async_setup_platform', return_value=mock_coro())
@patch('homeassistant.bootstrap.async_setup_component',
@patch('homeassistant.setup.async_setup_component',
return_value=mock_coro(True))
def test_setup_does_discovery(self, mock_setup_component, mock_setup):
"""Test setup for discovery."""

2
tests/helpers/test_event.py
View file

@ -6,7 +6,7 @@ from datetime import datetime, timedelta
from astral import Astral
from homeassistant.bootstrap import setup_component
from homeassistant.setup import setup_component
import homeassistant.core as ha
from homeassistant.const import MATCH_ALL
from homeassistant.helpers.event import (

2
tests/helpers/test_restore_state.py
View file

@ -3,7 +3,7 @@ import asyncio
from datetime import timedelta
from unittest.mock import patch, MagicMock
from homeassistant.bootstrap import setup_component
from homeassistant.setup import setup_component
from homeassistant.const import EVENT_HOMEASSISTANT_START
from homeassistant.core import CoreState, split_entity_id, State
import homeassistant.util.dt as dt_util