Logbook speedup (#18376)
* filter logbook results by entity_id prior to instantiating them * include by default, pass pep8 * pass pylint * use entityfilter, update tests
This commit is contained in:
1 parent
f241becf7f
commit
089a2f4e71
4 files changed
+112
-69
No files matched your search
@@ -136,8 +136,10 @@ class TestComponentLogbook(unittest.TestCase):
|
||||
eventB = self.create_state_changed_event(pointB, entity_id2, 20)
|
||||
eventA.data['old_state'] = None
|
||||
|
||||
events = logbook._exclude_events((ha.Event(EVENT_HOMEASSISTANT_STOP),
|
||||
eventA, eventB), {})
|
||||
events = logbook._exclude_events(
|
||||
(ha.Event(EVENT_HOMEASSISTANT_STOP),
|
||||
eventA, eventB),
|
||||
logbook._generate_filter_from_config({}))
|
||||
entries = list(logbook.humanify(self.hass, events))
|
||||
|
||||
assert 2 == len(entries)
|
||||
@@ -158,8 +160,10 @@ class TestComponentLogbook(unittest.TestCase):
|
||||
eventB = self.create_state_changed_event(pointB, entity_id2, 20)
|
||||
eventA.data['new_state'] = None
|
||||
|
||||
events = logbook._exclude_events((ha.Event(EVENT_HOMEASSISTANT_STOP),
|
||||
eventA, eventB), {})
|
||||
events = logbook._exclude_events(
|
||||
(ha.Event(EVENT_HOMEASSISTANT_STOP),
|
||||
eventA, eventB),
|
||||
logbook._generate_filter_from_config({}))
|
||||
entries = list(logbook.humanify(self.hass, events))
|
||||
|
||||
assert 2 == len(entries)
|
||||
@@ -180,8 +184,10 @@ class TestComponentLogbook(unittest.TestCase):
|
||||
{ATTR_HIDDEN: 'true'})
|
||||
eventB = self.create_state_changed_event(pointB, entity_id2, 20)
|
||||
|
||||
events = logbook._exclude_events((ha.Event(EVENT_HOMEASSISTANT_STOP),
|
||||
eventA, eventB), {})
|
||||
events = logbook._exclude_events(
|
||||
(ha.Event(EVENT_HOMEASSISTANT_STOP),
|
||||
eventA, eventB),
|
||||
logbook._generate_filter_from_config({}))
|
||||
entries = list(logbook.humanify(self.hass, events))
|
||||
|
||||
assert 2 == len(entries)
|
||||
@@ -207,7 +213,7 @@ class TestComponentLogbook(unittest.TestCase):
|
||||
logbook.CONF_ENTITIES: [entity_id, ]}}})
|
||||
events = logbook._exclude_events(
|
||||
(ha.Event(EVENT_HOMEASSISTANT_STOP), eventA, eventB),
|
||||
config[logbook.DOMAIN])
|
||||
logbook._generate_filter_from_config(config[logbook.DOMAIN]))
|
||||
entries = list(logbook.humanify(self.hass, events))
|
||||
|
||||
assert 2 == len(entries)
|
||||
@@ -233,7 +239,7 @@ class TestComponentLogbook(unittest.TestCase):
|
||||
logbook.CONF_DOMAINS: ['switch', ]}}})
|
||||
events = logbook._exclude_events(
|
||||
(ha.Event(EVENT_HOMEASSISTANT_START), eventA, eventB),
|
||||
config[logbook.DOMAIN])
|
||||
logbook._generate_filter_from_config(config[logbook.DOMAIN]))
|
||||
entries = list(logbook.humanify(self.hass, events))
|
||||
|
||||
assert 2 == len(entries)
|
||||
@@ -270,7 +276,7 @@ class TestComponentLogbook(unittest.TestCase):
|
||||
logbook.CONF_ENTITIES: [entity_id, ]}}})
|
||||
events = logbook._exclude_events(
|
||||
(ha.Event(EVENT_HOMEASSISTANT_STOP), eventA, eventB),
|
||||
config[logbook.DOMAIN])
|
||||
logbook._generate_filter_from_config(config[logbook.DOMAIN]))
|
||||
entries = list(logbook.humanify(self.hass, events))
|
||||
|
||||
assert 2 == len(entries)
|
||||
@@ -296,7 +302,7 @@ class TestComponentLogbook(unittest.TestCase):
|
||||
logbook.CONF_ENTITIES: [entity_id2, ]}}})
|
||||
events = logbook._exclude_events(
|
||||
(ha.Event(EVENT_HOMEASSISTANT_STOP), eventA, eventB),
|
||||
config[logbook.DOMAIN])
|
||||
logbook._generate_filter_from_config(config[logbook.DOMAIN]))
|
||||
entries = list(logbook.humanify(self.hass, events))
|
||||
|
||||
assert 2 == len(entries)
|
||||
@@ -322,7 +328,7 @@ class TestComponentLogbook(unittest.TestCase):
|
||||
logbook.CONF_DOMAINS: ['sensor', ]}}})
|
||||
events = logbook._exclude_events(
|
||||
(ha.Event(EVENT_HOMEASSISTANT_START), eventA, eventB),
|
||||
config[logbook.DOMAIN])
|
||||
logbook._generate_filter_from_config(config[logbook.DOMAIN]))
|
||||
entries = list(logbook.humanify(self.hass, events))
|
||||
|
||||
assert 2 == len(entries)
|
||||
@@ -356,15 +362,20 @@ class TestComponentLogbook(unittest.TestCase):
|
||||
logbook.CONF_ENTITIES: ['sensor.bli', ]}}})
|
||||
events = logbook._exclude_events(
|
||||
(ha.Event(EVENT_HOMEASSISTANT_START), eventA1, eventA2, eventA3,
|
||||
eventB1, eventB2), config[logbook.DOMAIN])
|
||||
eventB1, eventB2),
|
||||
logbook._generate_filter_from_config(config[logbook.DOMAIN]))
|
||||
entries = list(logbook.humanify(self.hass, events))
|
||||
|
||||
assert 3 == len(entries)
|
||||
assert 5 == len(entries)
|
||||
self.assert_entry(entries[0], name='Home Assistant', message='started',
|
||||
domain=ha.DOMAIN)
|
||||
self.assert_entry(entries[1], pointA, 'blu', domain='sensor',
|
||||
self.assert_entry(entries[1], pointA, 'bla', domain='switch',
|
||||
entity_id=entity_id)
|
||||
self.assert_entry(entries[2], pointA, 'blu', domain='sensor',
|
||||
entity_id=entity_id2)
|
||||
self.assert_entry(entries[2], pointB, 'blu', domain='sensor',
|
||||
self.assert_entry(entries[3], pointB, 'bla', domain='switch',
|
||||
entity_id=entity_id)
|
||||
self.assert_entry(entries[4], pointB, 'blu', domain='sensor',
|
||||
entity_id=entity_id2)
|
||||
|
||||
def test_exclude_auto_groups(self):
|
||||
@@ -377,7 +388,9 @@ class TestComponentLogbook(unittest.TestCase):
|
||||
eventB = self.create_state_changed_event(pointA, entity_id2, 20,
|
||||
{'auto': True})
|
||||
|
||||
events = logbook._exclude_events((eventA, eventB), {})
|
||||
events = logbook._exclude_events(
|
||||
(eventA, eventB),
|
||||
logbook._generate_filter_from_config({}))
|
||||
entries = list(logbook.humanify(self.hass, events))
|
||||
|
||||
assert 1 == len(entries)
|
||||
@@ -395,7 +408,9 @@ class TestComponentLogbook(unittest.TestCase):
|
||||
eventB = self.create_state_changed_event(
|
||||
pointA, entity_id2, 20, last_changed=pointA, last_updated=pointB)
|
||||
|
||||
events = logbook._exclude_events((eventA, eventB), {})
|
||||
events = logbook._exclude_events(
|
||||
(eventA, eventB),
|
||||
logbook._generate_filter_from_config({}))
|
||||
entries = list(logbook.humanify(self.hass, events))
|
||||
|
||||
assert 1 == len(entries)
|
||||
|
||||
Reference in new issue
Block a user