From 4e820ea30aecfd1b5ea9d99ac91f60f4533aa867 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Wed, 2 Nov 2016 19:16:59 -0700
Subject: [PATCH] Move mocks to async_start (#4182)

---
 tests/common.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/common.py b/tests/common.py
index ee84cc7c642..d665e17a503 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -58,8 +58,6 @@ def get_test_home_assistant():
     orig_start = hass.start
     orig_stop = hass.stop
 
-    @patch.object(hass.loop, 'add_signal_handler')
-    @patch.object(ha, '_async_create_timer')
     @patch.object(hass.loop, 'run_forever')
     @patch.object(hass.loop, 'close')
     def start_hass(*mocks):
@@ -100,6 +98,19 @@ def async_test_home_assistant(loop):
     hass.state = ha.CoreState.running
 
     hass.allow_pool = False
+
+    # Mock async_start
+    orig_start = hass.async_start
+
+    @asyncio.coroutine
+    def mock_async_start():
+        with patch.object(loop, 'add_signal_handler'), \
+             patch('homeassistant.core._async_create_timer'):
+            yield from orig_start()
+
+    hass.async_start = mock_async_start
+
+    # Mock async_init_pool
     orig_init = hass.async_init_pool
 
     @ha.callback