Cleanup async handling (#6388)

* Cleanups unneeded blocks

* Cleanup bootstrap

* dedicated update_ha_state

* Fix imap_email_content

* fx tests

* Fix lint & spell
This commit is contained in:
Pascal Vizeli authored and Paulus Schoutsen committed 2017-03-04 15:10:36 -08:00
1 parent 3044aecbe9
commit 8232f1ef65
30 files changed
+124 -108

No files matched your search

+35 -18
View File
@@ -140,10 +140,12 @@ class TestMediaPlayer(unittest.TestCase):
self.hass = get_test_home_assistant()
self.mock_mp_1 = MockMediaPlayer(self.hass, 'mock1')
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.mock_mp_2 = MockMediaPlayer(self.hass, 'mock2')
self.mock_mp_2.update_ha_state()
self.mock_mp_2.schedule_update_ha_state()
self.hass.block_till_done()
self.mock_mute_switch_id = switch.ENTITY_ID_FORMAT.format('mute')
self.hass.states.set(self.mock_mute_switch_id, STATE_OFF)
@@ -315,19 +317,22 @@ class TestMediaPlayer(unittest.TestCase):
self.assertEqual(None, ump._child_state)
self.mock_mp_1._state = STATE_PLAYING
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.assertEqual(self.mock_mp_1.entity_id,
ump._child_state.entity_id)
self.mock_mp_2._state = STATE_PLAYING
self.mock_mp_2.update_ha_state()
self.mock_mp_2.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.assertEqual(self.mock_mp_1.entity_id,
ump._child_state.entity_id)
self.mock_mp_1._state = STATE_OFF
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.assertEqual(self.mock_mp_2.entity_id,
ump._child_state.entity_id)
@@ -362,7 +367,8 @@ class TestMediaPlayer(unittest.TestCase):
self.assertTrue(ump.state, STATE_OFF)
self.mock_mp_1._state = STATE_PLAYING
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.assertEqual(STATE_PLAYING, ump.state)
@@ -382,7 +388,8 @@ class TestMediaPlayer(unittest.TestCase):
self.assertEqual(STATE_ON, ump.state)
self.mock_mp_1._state = STATE_PLAYING
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.assertEqual(STATE_PLAYING, ump.state)
@@ -402,12 +409,14 @@ class TestMediaPlayer(unittest.TestCase):
self.assertEqual(None, ump.volume_level)
self.mock_mp_1._state = STATE_PLAYING
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.assertEqual(0, ump.volume_level)
self.mock_mp_1._volume_level = 1
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.assertEqual(1, ump.volume_level)
@@ -425,7 +434,8 @@ class TestMediaPlayer(unittest.TestCase):
self.mock_mp_1._state = STATE_PLAYING
self.mock_mp_1._media_image_url = TEST_URL
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
# mock_mp_1 will convert the url to the api proxy url. This test
# ensures ump passes through the same url without an additional proxy.
@@ -443,12 +453,14 @@ class TestMediaPlayer(unittest.TestCase):
self.assertFalse(ump.is_volume_muted)
self.mock_mp_1._state = STATE_PLAYING
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.assertFalse(ump.is_volume_muted)
self.mock_mp_1._is_volume_muted = True
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.assertTrue(ump.is_volume_muted)
@@ -513,7 +525,8 @@ class TestMediaPlayer(unittest.TestCase):
self.mock_mp_1._supported_features = 512
self.mock_mp_1._state = STATE_PLAYING
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.assertEqual(512, ump.supported_features)
@@ -534,7 +547,8 @@ class TestMediaPlayer(unittest.TestCase):
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.mock_mp_1._state = STATE_PLAYING
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
check_flags = universal.SUPPORT_TURN_ON | universal.SUPPORT_TURN_OFF \
@@ -553,9 +567,10 @@ class TestMediaPlayer(unittest.TestCase):
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.mock_mp_1._state = STATE_OFF
self.mock_mp_1.update_ha_state()
self.mock_mp_1.schedule_update_ha_state()
self.mock_mp_2._state = STATE_OFF
self.mock_mp_2.update_ha_state()
self.mock_mp_2.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
run_coroutine_threadsafe(
@@ -574,7 +589,8 @@ class TestMediaPlayer(unittest.TestCase):
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.mock_mp_2._state = STATE_PLAYING
self.mock_mp_2.update_ha_state()
self.mock_mp_2.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
run_coroutine_threadsafe(
@@ -672,7 +688,8 @@ class TestMediaPlayer(unittest.TestCase):
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
self.mock_mp_2._state = STATE_PLAYING
self.mock_mp_2.update_ha_state()
self.mock_mp_2.schedule_update_ha_state()
self.hass.block_till_done()
run_coroutine_threadsafe(ump.async_update(), self.hass.loop).result()
run_coroutine_threadsafe(ump.async_turn_off(), self.hass.loop).result()
@@ -4,7 +4,6 @@ import email
from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText
import datetime
from threading import Event
import unittest
from homeassistant.helpers.template import Template
@@ -59,7 +58,8 @@ class EmailContentSensor(unittest.TestCase):
None)
sensor.entity_id = 'sensor.emailtest'
sensor.update()
sensor.schedule_update_ha_state(True)
self.hass.block_till_done()
self.assertEqual("Test Message", sensor.state)
self.assertEqual('sender@test.com',
sensor.device_state_attributes['from'])
@@ -87,7 +87,8 @@ class EmailContentSensor(unittest.TestCase):
['sender@test.com'], None)
sensor.entity_id = "sensor.emailtest"
sensor.update()
sensor.schedule_update_ha_state(True)
self.hass.block_till_done()
self.assertEqual("Test Message", sensor.state)
def test_multi_part_only_html(self):
@@ -110,7 +111,8 @@ class EmailContentSensor(unittest.TestCase):
None)
sensor.entity_id = 'sensor.emailtest'
sensor.update()
sensor.schedule_update_ha_state(True)
self.hass.block_till_done()
self.assertEqual(
"<html><head></head><body>Test Message</body></html>",
sensor.state)
@@ -132,7 +134,8 @@ class EmailContentSensor(unittest.TestCase):
['sender@test.com'], None)
sensor.entity_id = 'sensor.emailtest'
sensor.update()
sensor.schedule_update_ha_state(True)
self.hass.block_till_done()
self.assertEqual("Test Message", sensor.state)
def test_multiple_emails(self):
@@ -151,12 +154,8 @@ class EmailContentSensor(unittest.TestCase):
test_message2['Date'] = datetime.datetime(2016, 1, 1, 12, 44, 57)
test_message2.set_payload("Test Message 2")
states_received = Event()
def state_changed_listener(entity_id, from_s, to_s):
states.append(to_s)
if len(states) == 2:
states_received.set()
track_state_change(
self.hass, ['sensor.emailtest'], state_changed_listener)
@@ -167,10 +166,11 @@ class EmailContentSensor(unittest.TestCase):
'test_emails_sensor', ['sender@test.com'], None)
sensor.entity_id = 'sensor.emailtest'
sensor.update()
sensor.schedule_update_ha_state(True)
self.hass.block_till_done()
sensor.schedule_update_ha_state(True)
self.hass.block_till_done()
states_received.wait(5)
self.assertEqual("Test Message", states[0].state)
self.assertEqual("Test Message 2", states[1].state)
@@ -190,7 +190,8 @@ class EmailContentSensor(unittest.TestCase):
'test_emails_sensor', ['other@test.com'], None)
sensor.entity_id = 'sensor.emailtest'
sensor.update()
sensor.schedule_update_ha_state(True)
self.hass.block_till_done()
self.assertEqual(None, sensor.state)
def test_template(self):
@@ -208,7 +209,8 @@ class EmailContentSensor(unittest.TestCase):
self.hass))
sensor.entity_id = 'sensor.emailtest'
sensor.update()
sensor.schedule_update_ha_state(True)
self.hass.block_till_done()
self.assertEqual(
"Test from sender@test.com with message Test Message",
sensor.state)
+4 -2
View File
@@ -103,7 +103,8 @@ class TestComponentsCore(unittest.TestCase):
ent = entity.Entity()
ent.entity_id = 'test.entity'
ent.hass = self.hass
ent.update_ha_state()
ent.schedule_update_ha_state()
self.hass.block_till_done()
state = self.hass.states.get('test.entity')
assert state is not None
@@ -130,7 +131,8 @@ class TestComponentsCore(unittest.TestCase):
assert 10 == self.hass.config.latitude
assert 20 == self.hass.config.longitude
ent.update_ha_state()
ent.schedule_update_ha_state()
self.hass.block_till_done()
state = self.hass.states.get('test.entity')
assert state is not None