Merge pull request #3706 from home-assistant/hotfix-0-29-7b

Fix broken unit tests
This commit is contained in:
Paulus Schoutsen 2016-10-04 22:47:46 -07:00 committed by GitHub
commit 9d085a023c
3 changed files with 4 additions and 8 deletions

View File

@ -192,8 +192,6 @@ class HomeAssistant(object):
except KeyboardInterrupt: except KeyboardInterrupt:
self.loop.call_soon(stop_homeassistant) self.loop.call_soon(stop_homeassistant)
self.loop.run_forever() self.loop.run_forever()
finally:
self.loop.close()
@asyncio.coroutine @asyncio.coroutine
def async_start(self): def async_start(self):

View File

@ -78,6 +78,7 @@ def get_test_home_assistant(num_threads=None):
with patch.object(ha, 'async_create_timer', return_value=None): with patch.object(ha, 'async_create_timer', return_value=None):
with patch.object(ha, 'async_monitor_worker_pool', with patch.object(ha, 'async_monitor_worker_pool',
return_value=None): return_value=None):
with patch.object(hass.loop, 'add_signal_handler'):
orig_start() orig_start()
hass.block_till_done() hass.block_till_done()

View File

@ -1,8 +1,6 @@
"""Test to verify that Home Assistant core works.""" """Test to verify that Home Assistant core works."""
# pylint: disable=protected-access,too-many-public-methods # pylint: disable=protected-access,too-many-public-methods
# pylint: disable=too-few-public-methods # pylint: disable=too-few-public-methods
import os
import signal
import unittest import unittest
from unittest.mock import patch, MagicMock from unittest.mock import patch, MagicMock
from datetime import datetime, timedelta from datetime import datetime, timedelta
@ -14,8 +12,7 @@ from homeassistant.exceptions import InvalidEntityFormatError
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
from homeassistant.util.unit_system import (METRIC_SYSTEM) from homeassistant.util.unit_system import (METRIC_SYSTEM)
from homeassistant.const import ( from homeassistant.const import (
__version__, EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP, __version__, EVENT_STATE_CHANGED, ATTR_FRIENDLY_NAME, CONF_UNIT_SYSTEM)
EVENT_STATE_CHANGED, ATTR_FRIENDLY_NAME, CONF_UNIT_SYSTEM)
from tests.common import get_test_home_assistant from tests.common import get_test_home_assistant