Add support for glob matching to entity filters (#36913)
* Added GLOB capability to entityfilter and every place that uses it. All existing tests are passing * added tests for components affected by glob change * fixed flake8 error * mocking the correct listener * mocking correct bus method in azure test * tests passing in 3.7 and 3.8 * fixed formatting issue from rebase/conflict * Checking against glob patterns in more performant way * perf improvments and reverted unnecessarily adjusted tests * added new benchmark test around filters * no longer using get with default in entityfilter * changed filter name and removed logbook from filter benchmark * simplified benchmark tests from feedback * fixed apache tests and returned include exclude schemas to normal * fixed azure event hub tests to properly go through component logic * fixed azure test and clean up for other tests * renaming test files to match standard * merged mqtt statestream test changes with base * removed dependency on recorder filter schema from history * fixed recorder tests after merge and a bunch of lint errors
This commit is contained in:
1 parent
a1ac1fb091
commit
6c7355785a
23 files changed
+1832
-278
No files matched your search
@@ -6,6 +6,8 @@ import unittest
|
||||
import pytest
|
||||
|
||||
from homeassistant.components.recorder import (
|
||||
CONFIG_SCHEMA,
|
||||
DOMAIN,
|
||||
Recorder,
|
||||
run_information,
|
||||
run_information_from_instance,
|
||||
@@ -152,6 +154,19 @@ def test_saving_state_include_domains(hass_recorder):
|
||||
assert _state_empty_context(hass, "test2.recorder") == states[0]
|
||||
|
||||
|
||||
def test_saving_state_include_domains_globs(hass_recorder):
|
||||
"""Test saving and restoring a state."""
|
||||
hass = hass_recorder(
|
||||
{"include": {"domains": "test2", "entity_globs": "*.included_*"}}
|
||||
)
|
||||
states = _add_entities(
|
||||
hass, ["test.recorder", "test2.recorder", "test3.included_entity"]
|
||||
)
|
||||
assert len(states) == 2
|
||||
assert _state_empty_context(hass, "test2.recorder") == states[0]
|
||||
assert _state_empty_context(hass, "test3.included_entity") == states[1]
|
||||
|
||||
|
||||
def test_saving_state_incl_entities(hass_recorder):
|
||||
"""Test saving and restoring a state."""
|
||||
hass = hass_recorder({"include": {"entities": "test2.recorder"}})
|
||||
@@ -176,6 +191,18 @@ def test_saving_state_exclude_domains(hass_recorder):
|
||||
assert _state_empty_context(hass, "test2.recorder") == states[0]
|
||||
|
||||
|
||||
def test_saving_state_exclude_domains_globs(hass_recorder):
|
||||
"""Test saving and restoring a state."""
|
||||
hass = hass_recorder(
|
||||
{"exclude": {"domains": "test", "entity_globs": "*.excluded_*"}}
|
||||
)
|
||||
states = _add_entities(
|
||||
hass, ["test.recorder", "test2.recorder", "test2.excluded_entity"]
|
||||
)
|
||||
assert len(states) == 1
|
||||
assert _state_empty_context(hass, "test2.recorder") == states[0]
|
||||
|
||||
|
||||
def test_saving_state_exclude_entities(hass_recorder):
|
||||
"""Test saving and restoring a state."""
|
||||
hass = hass_recorder({"exclude": {"entities": "test.recorder"}})
|
||||
@@ -193,6 +220,20 @@ def test_saving_state_exclude_domain_include_entity(hass_recorder):
|
||||
assert len(states) == 2
|
||||
|
||||
|
||||
def test_saving_state_exclude_domain_glob_include_entity(hass_recorder):
|
||||
"""Test saving and restoring a state."""
|
||||
hass = hass_recorder(
|
||||
{
|
||||
"include": {"entities": ["test.recorder", "test.excluded_entity"]},
|
||||
"exclude": {"domains": "test", "entity_globs": "*._excluded_*"},
|
||||
}
|
||||
)
|
||||
states = _add_entities(
|
||||
hass, ["test.recorder", "test2.recorder", "test.excluded_entity"]
|
||||
)
|
||||
assert len(states) == 3
|
||||
|
||||
|
||||
def test_saving_state_include_domain_exclude_entity(hass_recorder):
|
||||
"""Test saving and restoring a state."""
|
||||
hass = hass_recorder(
|
||||
@@ -204,6 +245,22 @@ def test_saving_state_include_domain_exclude_entity(hass_recorder):
|
||||
assert _state_empty_context(hass, "test.ok").state == "state2"
|
||||
|
||||
|
||||
def test_saving_state_include_domain_glob_exclude_entity(hass_recorder):
|
||||
"""Test saving and restoring a state."""
|
||||
hass = hass_recorder(
|
||||
{
|
||||
"exclude": {"entities": ["test.recorder", "test2.included_entity"]},
|
||||
"include": {"domains": "test", "entity_globs": "*._included_*"},
|
||||
}
|
||||
)
|
||||
states = _add_entities(
|
||||
hass, ["test.recorder", "test2.recorder", "test.ok", "test2.included_entity"]
|
||||
)
|
||||
assert len(states) == 1
|
||||
assert _state_empty_context(hass, "test.ok") == states[0]
|
||||
assert _state_empty_context(hass, "test.ok").state == "state2"
|
||||
|
||||
|
||||
def test_recorder_setup_failure():
|
||||
"""Test some exceptions."""
|
||||
hass = get_test_home_assistant()
|
||||
@@ -220,8 +277,8 @@ def test_recorder_setup_failure():
|
||||
uri="sqlite://",
|
||||
db_max_retries=10,
|
||||
db_retry_wait=3,
|
||||
include={},
|
||||
exclude={},
|
||||
entity_filter=CONFIG_SCHEMA({DOMAIN: {}}),
|
||||
exclude_t=[],
|
||||
)
|
||||
rec.start()
|
||||
rec.join()
|
||||
@@ -243,6 +300,7 @@ async def test_defaults_set(hass):
|
||||
assert await async_setup_component(hass, "history", {})
|
||||
|
||||
assert recorder_config is not None
|
||||
# pylint: disable=unsubscriptable-object
|
||||
assert recorder_config["auto_purge"]
|
||||
assert recorder_config["purge_keep_days"] == 10
|
||||
|
||||
|
||||
Reference in new issue
Block a user