From 364ea9bfc3fbb01f2753844f58eaaaa8be31f7c6 Mon Sep 17 00:00:00 2001 From: pvizeli Date: Thu, 15 Jun 2017 09:45:18 +0200 Subject: [PATCH] fix other tests. --- .../components/automation/__init__.py | 1 + homeassistant/components/script.py | 5 +++-- .../components/device_tracker/test_asuswrt.py | 10 +++++----- tests/components/device_tracker/test_ddwrt.py | 18 +++++++++--------- .../device_tracker/test_upc_connect.py | 8 ++++---- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py index a99113b6f6f..09f0e286755 100644 --- a/homeassistant/components/automation/__init__.py +++ b/homeassistant/components/automation/__init__.py @@ -29,6 +29,7 @@ import homeassistant.helpers.config_validation as cv from homeassistant.components.frontend import register_built_in_panel DOMAIN = 'automation' +DEPENDENCIES = ['group'] ENTITY_ID_FORMAT = DOMAIN + '.{}' GROUP_NAME_ALL_AUTOMATIONS = 'all automations' diff --git a/homeassistant/components/script.py b/homeassistant/components/script.py index 6d2982dd262..996cef10d77 100644 --- a/homeassistant/components/script.py +++ b/homeassistant/components/script.py @@ -24,6 +24,9 @@ from homeassistant.helpers.script import Script _LOGGER = logging.getLogger(__name__) +DOMAIN = 'script' +DEPENDENCIES = ['group'] + ATTR_CAN_CANCEL = 'can_cancel' ATTR_LAST_ACTION = 'last_action' ATTR_LAST_TRIGGERED = 'last_triggered' @@ -31,8 +34,6 @@ ATTR_VARIABLES = 'variables' CONF_SEQUENCE = 'sequence' -DOMAIN = 'script' - ENTITY_ID_FORMAT = DOMAIN + '.{}' GROUP_NAME_ALL_SCRIPTS = 'all scripts' diff --git a/tests/components/device_tracker/test_asuswrt.py b/tests/components/device_tracker/test_asuswrt.py index 0de5ac67a30..b507bfea7c9 100644 --- a/tests/components/device_tracker/test_asuswrt.py +++ b/tests/components/device_tracker/test_asuswrt.py @@ -57,7 +57,7 @@ class TestComponentsDeviceTrackerASUSWRT(unittest.TestCase): def test_password_or_pub_key_required(self): \ # pylint: disable=invalid-name """Test creating an AsusWRT scanner without a pass or pubkey.""" - with assert_setup_component(0): + with assert_setup_component(0, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'asuswrt', @@ -82,7 +82,7 @@ class TestComponentsDeviceTrackerASUSWRT(unittest.TestCase): } } - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component(self.hass, DOMAIN, conf_dict) conf_dict[DOMAIN][CONF_MODE] = 'router' @@ -108,7 +108,7 @@ class TestComponentsDeviceTrackerASUSWRT(unittest.TestCase): } } - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component(self.hass, DOMAIN, conf_dict) conf_dict[DOMAIN][CONF_MODE] = 'router' @@ -192,7 +192,7 @@ class TestComponentsDeviceTrackerASUSWRT(unittest.TestCase): update_mock.start() self.addCleanup(update_mock.stop) - with assert_setup_component(0): + with assert_setup_component(0, DOMAIN): assert setup_component(self.hass, DOMAIN, {DOMAIN: conf_dict}) ssh.login.assert_not_called() @@ -264,7 +264,7 @@ class TestComponentsDeviceTrackerASUSWRT(unittest.TestCase): update_mock.start() self.addCleanup(update_mock.stop) - with assert_setup_component(0): + with assert_setup_component(0, DOMAIN): assert setup_component(self.hass, DOMAIN, {DOMAIN: conf_dict}) telnet.login.assert_not_called() diff --git a/tests/components/device_tracker/test_ddwrt.py b/tests/components/device_tracker/test_ddwrt.py index d55bc4e2ae1..c66029b5fca 100644 --- a/tests/components/device_tracker/test_ddwrt.py +++ b/tests/components/device_tracker/test_ddwrt.py @@ -57,7 +57,7 @@ class TestDdwrt(unittest.TestCase): mock_request.register_uri( 'GET', r'http://%s/Status_Wireless.live.asp' % TEST_HOST, status_code=401) - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'ddwrt', @@ -77,7 +77,7 @@ class TestDdwrt(unittest.TestCase): mock_request.register_uri( 'GET', r'http://%s/Status_Wireless.live.asp' % TEST_HOST, status_code=444) - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'ddwrt', @@ -95,7 +95,7 @@ class TestDdwrt(unittest.TestCase): 'ddwrt.DdWrtDeviceScanner.get_ddwrt_data', return_value=None) def test_no_response(self, data_mock, error_mock): """Create a Ddwrt scanner with no response in init, should fail.""" - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'ddwrt', @@ -112,7 +112,7 @@ class TestDdwrt(unittest.TestCase): @mock.patch('homeassistant.components.device_tracker.ddwrt._LOGGER.error') def test_get_timeout(self, mock_error, mock_request): """Test get Ddwrt data with request time out.""" - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'ddwrt', @@ -140,7 +140,7 @@ class TestDdwrt(unittest.TestCase): 'GET', r'http://%s/Status_Lan.live.asp' % TEST_HOST, text=load_fixture('Ddwrt_Status_Lan.txt')) - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'ddwrt', @@ -169,7 +169,7 @@ class TestDdwrt(unittest.TestCase): mock_request.register_uri( 'GET', r'http://%s/Status_Lan.live.asp' % TEST_HOST, text=None) - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'ddwrt', @@ -198,7 +198,7 @@ class TestDdwrt(unittest.TestCase): text=load_fixture('Ddwrt_Status_Lan.txt'). replace('dhcp_leases', 'missing')) - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'ddwrt', @@ -229,7 +229,7 @@ class TestDdwrt(unittest.TestCase): 'GET', r'http://%s/Status_Lan.live.asp' % TEST_HOST, text=load_fixture('Ddwrt_Status_Lan.txt')) - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'ddwrt', @@ -249,7 +249,7 @@ class TestDdwrt(unittest.TestCase): 'GET', r'http://%s/Status_Lan.live.asp' % TEST_HOST, text=load_fixture('Ddwrt_Status_Lan.txt')) - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'ddwrt', diff --git a/tests/components/device_tracker/test_upc_connect.py b/tests/components/device_tracker/test_upc_connect.py index 87e84c000d0..dea53b16559 100644 --- a/tests/components/device_tracker/test_upc_connect.py +++ b/tests/components/device_tracker/test_upc_connect.py @@ -58,7 +58,7 @@ class TestUPCConnect(object): content=b'successful' ) - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'upc_connect', @@ -84,7 +84,7 @@ class TestUPCConnect(object): status=404 ) - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'upc_connect', @@ -114,7 +114,7 @@ class TestUPCConnect(object): exc=asyncio.TimeoutError() ) - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'upc_connect', @@ -143,7 +143,7 @@ class TestUPCConnect(object): content=b'successful', ) - with assert_setup_component(1): + with assert_setup_component(1, DOMAIN): assert setup_component( self.hass, DOMAIN, {DOMAIN: { CONF_PLATFORM: 'upc_connect',