Reorg tests folder

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):

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)
 

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

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)
 
 

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):

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):

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

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):

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):

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 = []

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 = []

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

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)

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):