From 114fae76e17ece1fd224795098e251dfcb958797 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Tue, 4 Oct 2016 22:23:58 -0700
Subject: [PATCH] Fix broken unit tests

---
 homeassistant/core.py | 2 --
 tests/common.py       | 5 +++--
 tests/test_core.py    | 5 +----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/homeassistant/core.py b/homeassistant/core.py
index 36e12db6b04..776e4b749e7 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -192,8 +192,6 @@ class HomeAssistant(object):
         except KeyboardInterrupt:
             self.loop.call_soon(stop_homeassistant)
             self.loop.run_forever()
-        finally:
-            self.loop.close()
 
     @asyncio.coroutine
     def async_start(self):
diff --git a/tests/common.py b/tests/common.py
index ceb9bf3c058..5ccb8efeaca 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -78,8 +78,9 @@ def get_test_home_assistant(num_threads=None):
                 with patch.object(ha, 'async_create_timer', return_value=None):
                     with patch.object(ha, 'async_monitor_worker_pool',
                                       return_value=None):
-                        orig_start()
-                        hass.block_till_done()
+                        with patch.object(hass.loop, 'add_signal_handler'):
+                            orig_start()
+                            hass.block_till_done()
 
     def stop_hass():
         orig_stop()
diff --git a/tests/test_core.py b/tests/test_core.py
index 5f41aadfd25..5319bce840f 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -1,8 +1,6 @@
 """Test to verify that Home Assistant core works."""
 # pylint: disable=protected-access,too-many-public-methods
 # pylint: disable=too-few-public-methods
-import os
-import signal
 import unittest
 from unittest.mock import patch, MagicMock
 from datetime import datetime, timedelta
@@ -14,8 +12,7 @@ from homeassistant.exceptions import InvalidEntityFormatError
 import homeassistant.util.dt as dt_util
 from homeassistant.util.unit_system import (METRIC_SYSTEM)
 from homeassistant.const import (
-    __version__, EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP,
-    EVENT_STATE_CHANGED, ATTR_FRIENDLY_NAME, CONF_UNIT_SYSTEM)
+    __version__, EVENT_STATE_CHANGED, ATTR_FRIENDLY_NAME, CONF_UNIT_SYSTEM)
 
 from tests.common import get_test_home_assistant