From cae10cfe26a9787329ffc5956bf81a7852863266 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 26 Sep 2016 23:20:36 +0200 Subject: [PATCH] Use setup_component in tests v2 (#3537) * setup_component - sun * setup_component - updater * setup_component - weblink --- tests/components/test_sun.py | 10 +++++++--- tests/components/test_updater.py | 7 ++++--- tests/components/test_weblink.py | 3 ++- tests/helpers/test_event.py | 7 +++++-- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/tests/components/test_sun.py b/tests/components/test_sun.py index be486bb7e70..5163c926048 100644 --- a/tests/components/test_sun.py +++ b/tests/components/test_sun.py @@ -4,6 +4,7 @@ import unittest from unittest.mock import patch from datetime import timedelta, datetime +from homeassistant.bootstrap import setup_component import homeassistant.core as ha import homeassistant.util.dt as dt_util import homeassistant.components.sun as sun @@ -31,7 +32,8 @@ class TestSun(unittest.TestCase): def test_setting_rising(self): """Test retrieving sun setting and rising.""" - sun.setup(self.hass, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) + setup_component(self.hass, sun.DOMAIN, { + sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) from astral import Astral @@ -71,7 +73,8 @@ class TestSun(unittest.TestCase): def test_state_change(self): """Test if the state changes at next setting/rising.""" - sun.setup(self.hass, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) + setup_component(self.hass, sun.DOMAIN, { + sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) if sun.is_on(self.hass): test_state = sun.STATE_BELOW_HORIZON @@ -98,7 +101,8 @@ class TestSun(unittest.TestCase): with patch('homeassistant.helpers.condition.dt_util.utcnow', return_value=june): - assert sun.setup(self.hass, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) + assert setup_component(self.hass, sun.DOMAIN, { + sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) state = self.hass.states.get(sun.ENTITY_ID) diff --git a/tests/components/test_updater.py b/tests/components/test_updater.py index d5ff225dfc0..75879f3cbd0 100644 --- a/tests/components/test_updater.py +++ b/tests/components/test_updater.py @@ -4,6 +4,7 @@ from unittest.mock import patch import requests +from homeassistant.bootstrap import setup_component from homeassistant.components import updater import homeassistant.util.dt as dt_util from tests.common import fire_time_changed, get_test_home_assistant @@ -31,7 +32,7 @@ class TestUpdater(unittest.TestCase): mock_get_newest_version.return_value = NEW_VERSION updater.CURRENT_VERSION = MOCK_CURRENT_VERSION - self.assertTrue(updater.setup(self.hass, { + self.assertTrue(setup_component(self.hass, updater.DOMAIN, { 'updater': None })) @@ -44,7 +45,7 @@ class TestUpdater(unittest.TestCase): mock_get_newest_version.return_value = MOCK_CURRENT_VERSION updater.CURRENT_VERSION = MOCK_CURRENT_VERSION - self.assertTrue(updater.setup(self.hass, { + self.assertTrue(setup_component(self.hass, updater.DOMAIN, { 'updater': None })) @@ -76,6 +77,6 @@ class TestUpdater(unittest.TestCase): """Test if the updater component is disabled on dev.""" updater.CURRENT_VERSION = MOCK_CURRENT_VERSION + 'dev' - self.assertFalse(updater.setup(self.hass, { + self.assertFalse(setup_component(self.hass, updater.DOMAIN, { 'updater': None })) diff --git a/tests/components/test_weblink.py b/tests/components/test_weblink.py index bb539d902ff..78cf6b75db7 100644 --- a/tests/components/test_weblink.py +++ b/tests/components/test_weblink.py @@ -1,6 +1,7 @@ """The tests for the weblink component.""" import unittest +from homeassistant.bootstrap import setup_component from homeassistant.components import weblink from homeassistant import bootstrap @@ -28,7 +29,7 @@ class TestComponentWeblink(unittest.TestCase): def test_entities_get_created(self): """Test if new entity is created.""" - self.assertTrue(weblink.setup(self.hass, { + self.assertTrue(setup_component(self.hass, weblink.DOMAIN, { weblink.DOMAIN: { 'entities': [ { diff --git a/tests/helpers/test_event.py b/tests/helpers/test_event.py index 25335de96aa..4993ce92b3a 100644 --- a/tests/helpers/test_event.py +++ b/tests/helpers/test_event.py @@ -6,6 +6,7 @@ from datetime import datetime, timedelta from astral import Astral +from homeassistant.bootstrap import setup_component import homeassistant.core as ha from homeassistant.const import MATCH_ALL from homeassistant.helpers.event import ( @@ -186,7 +187,8 @@ class TestEventHelpers(unittest.TestCase): # Setup sun component self.hass.config.latitude = latitude self.hass.config.longitude = longitude - sun.setup(self.hass, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) + setup_component(self.hass, sun.DOMAIN, { + sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) # Get next sunrise/sunset astral = Astral() @@ -241,7 +243,8 @@ class TestEventHelpers(unittest.TestCase): # Setup sun component self.hass.config.latitude = latitude self.hass.config.longitude = longitude - sun.setup(self.hass, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) + setup_component(self.hass, sun.DOMAIN, { + sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) # Get next sunrise/sunset astral = Astral()