From 100948eb380617d37938103a0d8ad12a0bb2cfd7 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>
Date: Tue, 25 Nov 2014 00:28:14 -0800
Subject: [PATCH] Fix to make tests work on Travis CI

---
 .../switch_platform.py => mock_switch_platform.py}  |  0
 test/test_component_switch.py                       | 13 +++++++------
 test/test_loader.py                                 |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)
 rename test/{mock/switch_platform.py => mock_switch_platform.py} (100%)

diff --git a/test/mock/switch_platform.py b/test/mock_switch_platform.py
similarity index 100%
rename from test/mock/switch_platform.py
rename to test/mock_switch_platform.py
diff --git a/test/test_component_switch.py b/test/test_component_switch.py
index 7f60d837642..61bffec92cb 100644
--- a/test/test_component_switch.py
+++ b/test/test_component_switch.py
@@ -12,7 +12,7 @@ import homeassistant.loader as loader
 import homeassistant.components as components
 import homeassistant.components.switch as switch
 
-from mock import switch_platform
+import mock_switch_platform
 
 
 class TestSwitch(unittest.TestCase):
@@ -21,14 +21,15 @@ class TestSwitch(unittest.TestCase):
     def setUp(self):  # pylint: disable=invalid-name
         self.hass = ha.HomeAssistant()
         loader.prepare(self.hass)
-        loader.set_component('switch.test', switch_platform)
+        loader.set_component('switch.test', mock_switch_platform)
 
         self.assertTrue(switch.setup(
             self.hass, {switch.DOMAIN: {ha.CONF_TYPE: 'test'}}
         ))
 
         # Switch 1 is ON, switch 2 is OFF
-        self.switch_1, self.switch_2 = switch_platform.get_switches(None, None)
+        self.switch_1, self.switch_2 = \
+            mock_switch_platform.get_switches(None, None)
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """
@@ -88,12 +89,12 @@ class TestSwitch(unittest.TestCase):
         ))
 
         # Test if switch component returns 0 switches
-        switch_platform.fake_no_switches(True)
+        mock_switch_platform.fake_no_switches(True)
 
-        self.assertEqual([], switch_platform.get_switches(None, None))
+        self.assertEqual([], mock_switch_platform.get_switches(None, None))
 
         self.assertFalse(switch.setup(
             self.hass, {switch.DOMAIN: {ha.CONF_TYPE: 'test'}}
         ))
 
-        switch_platform.fake_no_switches(False)
+        mock_switch_platform.fake_no_switches(False)
diff --git a/test/test_loader.py b/test/test_loader.py
index 416eb832a7f..3df83292df9 100644
--- a/test/test_loader.py
+++ b/test/test_loader.py
@@ -11,7 +11,7 @@ import homeassistant as ha
 import homeassistant.loader as loader
 import homeassistant.components.http as http
 
-from mock import switch_platform
+import mock_switch_platform
 
 
 class TestLoader(unittest.TestCase):
@@ -26,10 +26,10 @@ class TestLoader(unittest.TestCase):
 
     def test_set_component(self):
         """ Test if set_component works. """
-        loader.set_component('switch.test', switch_platform)
+        loader.set_component('switch.test', mock_switch_platform)
 
         self.assertEqual(
-            switch_platform, loader.get_component('switch.test'))
+            mock_switch_platform, loader.get_component('switch.test'))
 
     def test_get_component(self):
         """ Test if get_component works. """