From df3ee6005a0dffd7c7e71455bb907ce7a86f44f1 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Tue, 4 Aug 2015 18:15:22 +0200
Subject: [PATCH] Nicer test imports

unittest changes import path so old style worked but is confusing
---
 tests/components/test_demo.py                     | 2 +-
 tests/components/test_device_sun_light_trigger.py | 2 +-
 tests/components/test_device_tracker.py           | 2 +-
 tests/components/test_history.py                  | 2 +-
 tests/components/test_light.py                    | 2 +-
 tests/components/test_logbook.py                  | 2 +-
 tests/components/test_media_player.py             | 2 +-
 tests/components/test_recorder.py                 | 2 +-
 tests/components/test_switch.py                   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/components/test_demo.py b/tests/components/test_demo.py
index 628c7e84bfe..9e697fb0c74 100644
--- a/tests/components/test_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 common import mock_http_component
+from tests.common import mock_http_component
 
 
 class TestDemo(unittest.TestCase):
diff --git a/tests/components/test_device_sun_light_trigger.py b/tests/components/test_device_sun_light_trigger.py
index 16b89468201..05b2bf11bea 100644
--- a/tests/components/test_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 common import (
+from tests.common import (
     get_test_home_assistant, ensure_sun_risen, ensure_sun_set,
     trigger_device_tracker_scan)
 
diff --git a/tests/components/test_device_tracker.py b/tests/components/test_device_tracker.py
index 1d595df3f5a..bbc647987c9 100644
--- a/tests/components/test_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 common import get_test_home_assistant
+from tests.common import get_test_home_assistant
 
 
 def setUpModule():   # pylint: disable=invalid-name
diff --git a/tests/components/test_history.py b/tests/components/test_history.py
index 1d0d787b95d..675e2d022d9 100644
--- a/tests/components/test_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 common import (
+from tests.common import (
     mock_http_component, mock_state_change_event, get_test_home_assistant)
 
 
diff --git a/tests/components/test_light.py b/tests/components/test_light.py
index 5142823e8ef..e56dcbb02ad 100644
--- a/tests/components/test_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 common import mock_service, get_test_home_assistant
+from tests.common import mock_service, get_test_home_assistant
 
 
 class TestLight(unittest.TestCase):
diff --git a/tests/components/test_logbook.py b/tests/components/test_logbook.py
index 2a426d0fcdc..cd415590d2d 100644
--- a/tests/components/test_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 common import get_test_home_assistant, mock_http_component
+from tests.common import get_test_home_assistant, mock_http_component
 
 
 class TestComponentHistory(unittest.TestCase):
diff --git a/tests/components/test_media_player.py b/tests/components/test_media_player.py
index d79ad89609f..f3f0128af3e 100644
--- a/tests/components/test_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 common import mock_service
+from tests.common import mock_service
 
 
 def setUpModule():   # pylint: disable=invalid-name
diff --git a/tests/components/test_recorder.py b/tests/components/test_recorder.py
index eb90f2331d9..26e5fdfd6b7 100644
--- a/tests/components/test_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 common import get_test_home_assistant
+from tests.common import get_test_home_assistant
 
 
 class TestRecorder(unittest.TestCase):
diff --git a/tests/components/test_switch.py b/tests/components/test_switch.py
index 273c5987be2..642c7f45aa9 100644
--- a/tests/components/test_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 common import get_test_home_assistant
+from tests.common import get_test_home_assistant
 
 
 class TestSwitch(unittest.TestCase):