diff --git a/tests/helpers.py b/tests/common.py similarity index 100% rename from tests/helpers.py rename to tests/common.py diff --git a/tests/components/__init__.py b/tests/components/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_component_api.py b/tests/components/test_api.py similarity index 100% rename from tests/test_component_api.py rename to tests/components/test_api.py diff --git a/tests/test_component_configurator.py b/tests/components/test_configurator.py similarity index 100% rename from tests/test_component_configurator.py rename to tests/components/test_configurator.py diff --git a/tests/test_component_demo.py b/tests/components/test_demo.py similarity index 96% rename from tests/test_component_demo.py rename to tests/components/test_demo.py index d7a64167622..628c7e84bfe 100644 --- a/tests/test_component_demo.py +++ b/tests/components/test_demo.py @@ -9,7 +9,7 @@ import unittest import homeassistant as ha import homeassistant.components.demo as demo -from helpers import mock_http_component +from common import mock_http_component class TestDemo(unittest.TestCase): diff --git a/tests/test_component_device_sun_light_trigger.py b/tests/components/test_device_sun_light_trigger.py similarity index 99% rename from tests/test_component_device_sun_light_trigger.py rename to tests/components/test_device_sun_light_trigger.py index 05452a830ec..16b89468201 100644 --- a/tests/test_component_device_sun_light_trigger.py +++ b/tests/components/test_device_sun_light_trigger.py @@ -14,7 +14,7 @@ from homeassistant.components import ( device_tracker, light, sun, device_sun_light_trigger) -from helpers import ( +from common import ( get_test_home_assistant, ensure_sun_risen, ensure_sun_set, trigger_device_tracker_scan) diff --git a/tests/test_component_device_tracker.py b/tests/components/test_device_tracker.py similarity index 99% rename from tests/test_component_device_tracker.py rename to tests/components/test_device_tracker.py index 143c28c9cdb..1d595df3f5a 100644 --- a/tests/test_component_device_tracker.py +++ b/tests/components/test_device_tracker.py @@ -18,7 +18,7 @@ from homeassistant.const import ( DEVICE_DEFAULT_NAME) import homeassistant.components.device_tracker as device_tracker -from helpers import get_test_home_assistant +from common import get_test_home_assistant def setUpModule(): # pylint: disable=invalid-name diff --git a/tests/test_component_frontend.py b/tests/components/test_frontend.py similarity index 100% rename from tests/test_component_frontend.py rename to tests/components/test_frontend.py diff --git a/tests/test_component_group.py b/tests/components/test_group.py similarity index 100% rename from tests/test_component_group.py rename to tests/components/test_group.py diff --git a/tests/test_component_history.py b/tests/components/test_history.py similarity index 99% rename from tests/test_component_history.py rename to tests/components/test_history.py index 7ad657f54b5..1d0d787b95d 100644 --- a/tests/test_component_history.py +++ b/tests/components/test_history.py @@ -13,7 +13,7 @@ import homeassistant as ha import homeassistant.util.dt as dt_util from homeassistant.components import history, recorder -from helpers import ( +from common import ( mock_http_component, mock_state_change_event, get_test_home_assistant) diff --git a/tests/test_component_core.py b/tests/components/test_init.py similarity index 100% rename from tests/test_component_core.py rename to tests/components/test_init.py diff --git a/tests/test_component_light.py b/tests/components/test_light.py similarity index 99% rename from tests/test_component_light.py rename to tests/components/test_light.py index 07f8e8e14c9..5142823e8ef 100644 --- a/tests/test_component_light.py +++ b/tests/components/test_light.py @@ -15,7 +15,7 @@ from homeassistant.const import ( SERVICE_TURN_ON, SERVICE_TURN_OFF) import homeassistant.components.light as light -from helpers import mock_service, get_test_home_assistant +from common import mock_service, get_test_home_assistant class TestLight(unittest.TestCase): diff --git a/tests/test_component_logbook.py b/tests/components/test_logbook.py similarity index 97% rename from tests/test_component_logbook.py rename to tests/components/test_logbook.py index 33b7b5f915b..2a426d0fcdc 100644 --- a/tests/test_component_logbook.py +++ b/tests/components/test_logbook.py @@ -14,7 +14,7 @@ from homeassistant.const import ( import homeassistant.util.dt as dt_util from homeassistant.components import logbook -from helpers import get_test_home_assistant, mock_http_component +from common import get_test_home_assistant, mock_http_component class TestComponentHistory(unittest.TestCase): diff --git a/tests/test_component_media_player.py b/tests/components/test_media_player.py similarity index 98% rename from tests/test_component_media_player.py rename to tests/components/test_media_player.py index b7f0b847e80..d79ad89609f 100644 --- a/tests/test_component_media_player.py +++ b/tests/components/test_media_player.py @@ -15,7 +15,7 @@ from homeassistant.const import ( SERVICE_MEDIA_PLAY_PAUSE, SERVICE_MEDIA_PLAY, SERVICE_MEDIA_PAUSE, SERVICE_MEDIA_NEXT_TRACK, SERVICE_MEDIA_PREVIOUS_TRACK, ATTR_ENTITY_ID) import homeassistant.components.media_player as media_player -from helpers import mock_service +from common import mock_service def setUpModule(): # pylint: disable=invalid-name diff --git a/tests/test_component_recorder.py b/tests/components/test_recorder.py similarity index 97% rename from tests/test_component_recorder.py rename to tests/components/test_recorder.py index 68c63b637d0..eb90f2331d9 100644 --- a/tests/test_component_recorder.py +++ b/tests/components/test_recorder.py @@ -11,7 +11,7 @@ import os from homeassistant.const import MATCH_ALL from homeassistant.components import recorder -from helpers import get_test_home_assistant +from common import get_test_home_assistant class TestRecorder(unittest.TestCase): diff --git a/tests/test_component_sun.py b/tests/components/test_sun.py similarity index 100% rename from tests/test_component_sun.py rename to tests/components/test_sun.py diff --git a/tests/test_component_switch.py b/tests/components/test_switch.py similarity index 98% rename from tests/test_component_switch.py rename to tests/components/test_switch.py index cbc161be853..273c5987be2 100644 --- a/tests/test_component_switch.py +++ b/tests/components/test_switch.py @@ -11,7 +11,7 @@ import homeassistant.loader as loader from homeassistant.const import STATE_ON, STATE_OFF, CONF_PLATFORM import homeassistant.components.switch as switch -from helpers import get_test_home_assistant +from common import get_test_home_assistant class TestSwitch(unittest.TestCase): diff --git a/tests/config/custom_components/light/test.py b/tests/config/custom_components/light/test.py index f7f355c4b30..1512d080b05 100644 --- a/tests/config/custom_components/light/test.py +++ b/tests/config/custom_components/light/test.py @@ -7,7 +7,7 @@ Provides a mock switch platform. Call init before using it in your tests to ensure clean test data. """ from homeassistant.const import STATE_ON, STATE_OFF -from tests.helpers import MockToggleDevice +from tests.common import MockToggleDevice DEVICES = [] diff --git a/tests/config/custom_components/switch/test.py b/tests/config/custom_components/switch/test.py index 178faf7fcdc..bb95154a94b 100644 --- a/tests/config/custom_components/switch/test.py +++ b/tests/config/custom_components/switch/test.py @@ -7,7 +7,7 @@ Provides a mock switch platform. Call init before using it in your tests to ensure clean test data. """ from homeassistant.const import STATE_ON, STATE_OFF -from tests.helpers import MockToggleDevice +from tests.common import MockToggleDevice DEVICES = [] diff --git a/tests/helpers/__init__.py b/tests/helpers/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_helper_entity.py b/tests/helpers/test_entity.py similarity index 100% rename from tests/test_helper_entity.py rename to tests/helpers/test_entity.py diff --git a/tests/test_helpers.py b/tests/helpers/test_init.py similarity index 97% rename from tests/test_helpers.py rename to tests/helpers/test_init.py index adc4b0d0788..9257dd634ef 100644 --- a/tests/test_helpers.py +++ b/tests/helpers/test_init.py @@ -7,7 +7,7 @@ Tests component helpers. # pylint: disable=protected-access,too-many-public-methods import unittest -from helpers import get_test_home_assistant +from common import get_test_home_assistant import homeassistant as ha import homeassistant.loader as loader diff --git a/tests/test_config.py b/tests/test_config.py index 0ea18eead82..368f660eeb7 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -16,7 +16,7 @@ from homeassistant.const import ( CONF_LATITUDE, CONF_LONGITUDE, CONF_TEMPERATURE_UNIT, CONF_NAME, CONF_TIME_ZONE) -from helpers import get_test_config_dir +from common import get_test_config_dir CONFIG_DIR = get_test_config_dir() YAML_PATH = os.path.join(CONFIG_DIR, config_util.YAML_CONFIG_FILE) diff --git a/tests/test_core.py b/tests/test_init.py similarity index 100% rename from tests/test_core.py rename to tests/test_init.py diff --git a/tests/test_loader.py b/tests/test_loader.py index dd80587b247..03bd7e7419c 100644 --- a/tests/test_loader.py +++ b/tests/test_loader.py @@ -10,7 +10,7 @@ import unittest import homeassistant.loader as loader import homeassistant.components.http as http -from helpers import get_test_home_assistant, MockModule +from common import get_test_home_assistant, MockModule class TestLoader(unittest.TestCase): diff --git a/tests/util/__init__.py b/tests/util/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/test_util_color.py b/tests/util/test_color.py similarity index 100% rename from tests/test_util_color.py rename to tests/util/test_color.py diff --git a/tests/test_util_dt.py b/tests/util/test_dt.py similarity index 100% rename from tests/test_util_dt.py rename to tests/util/test_dt.py diff --git a/tests/test_util.py b/tests/util/test_init.py similarity index 100% rename from tests/test_util.py rename to tests/util/test_init.py