New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add automation and script events to logbook filter events #19253

Merged
merged 8 commits into from Dec 14, 2018

Conversation

Projects
None yet
5 participants
@luca-angemi
Copy link
Contributor

luca-angemi commented Dec 13, 2018

Description:

Logbook was not filtering out automation and script events that were filtered by user config.
Related to #19220

Example entry for configuration.yaml (if applicable):

logbook:
  exclude:
    entities:
      - automation.aut1

Checklist:

  • The code change is tested and works locally.
  • Local tests pass with tox. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • New dependencies have been added to the REQUIREMENTS variable (example).
  • New dependencies are only imported inside functions that use them (example).
  • New or updated dependencies have been added to requirements_all.txt by running script/gen_requirements_all.py.
  • New files were added to .coveragerc.

If the code does not interact with devices:

  • Tests have been added to verify that the new code works.
Show resolved Hide resolved homeassistant/components/logbook.py Outdated
Show resolved Hide resolved homeassistant/components/logbook.py Outdated
@hunterjm
Copy link
Contributor

hunterjm left a comment

Thanks for this! Completely missed it.

Show resolved Hide resolved homeassistant/components/logbook.py Outdated
Show resolved Hide resolved homeassistant/components/logbook.py Outdated
@balloob

This comment has been minimized.

Copy link
Member

balloob commented Dec 13, 2018

Test please.

@hunterjm

This comment has been minimized.

Copy link
Contributor

hunterjm commented Dec 13, 2018

Test please.

test_logbook.py::test_exclude_automation_events should be modified for the new automation event, and duplicated and updated for the new script event.

luca-angemi added some commits Dec 13, 2018

@luca-angemi

This comment has been minimized.

Copy link
Contributor

luca-angemi commented Dec 13, 2018

@hunterjm @balloob

it's the first time I modify a test, could you please take a look I didn't make any mistake?

@hunterjm
Copy link
Contributor

hunterjm left a comment

Looks good outside of some additional event data attributes being set in the test.

Show resolved Hide resolved tests/components/test_logbook.py Outdated
Show resolved Hide resolved tests/components/test_logbook.py Outdated
@hunterjm

This comment has been minimized.

Copy link
Contributor

hunterjm commented Dec 13, 2018

@luca-angemi - Need to remove message here too:

message = 'has been triggered'

@luca-angemi

This comment has been minimized.

Copy link
Contributor

luca-angemi commented Dec 14, 2018

Done. Thanks for your patience :)

@balloob balloob added this to the 0.84.2 milestone Dec 14, 2018

@balloob balloob merged commit fb680bc into home-assistant:dev Dec 14, 2018

5 checks passed

Hound No violations found. Woof!
WIP ready for review
Details
cla-bot Everyone involved has signed the CLA
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls First build on patch-2 at 92.894%
Details

@wafflebot wafflebot bot removed the in progress label Dec 14, 2018

@balloob

This comment has been minimized.

Copy link
Member

balloob commented Dec 14, 2018

Awesome, great work! Including it in 0.84.2

balloob added a commit that referenced this pull request Dec 14, 2018

Add automation and script events to logbook filter events (#19253)
* Add automation and script events to logbook filter events

* Update logbook.py

* Update logbook.py

* Update logbook tests

* Update test_logbook.py

* Update test_logbook.py

* Update test_logbook.py

* Update test_logbook.py

@balloob balloob referenced this pull request Dec 14, 2018

Merged

0.84.2 #19281

@luca-angemi luca-angemi deleted the luca-angemi:patch-2 branch Dec 14, 2018

mxworm added a commit to mxworm/home-assistant that referenced this pull request Dec 14, 2018

Merge branch 'dev' into current
* dev: (88 commits)
  huawei_lte: Fetch only required data (home-assistant#17618)
  Adding support for Plum Lightpad (home-assistant#16576)
  Fix restore state for manual alarm control panel (home-assistant#19284)
  Set InsteonEntity name to be combo of description and address. (home-assistant#17262)
  Device config for Fibaro hub integration (home-assistant#19171)
  Add air pollutants component (home-assistant#18707)
  Updated ELIQ Online sensor to async API (home-assistant#19248)
  Set unavailable when unreachable (home-assistant#19012)
  Make variable `entity_id` available to value_template for MQTT binary sensor (home-assistant#19195)
  home-assistant#17333: update to use DOMAIN constants and standards. (home-assistant#19242)
  Fix race in entity_platform.async_add_entities (home-assistant#19222)
  Fix race in entity_platform.async_add_entities (home-assistant#19222)
  Bumped version to 0.84.2
  Fix call to super() (home-assistant#19279)
  Fix OwnTracks deadlocking (home-assistant#19260)
  Fix list (fixes home-assistant#19235) (home-assistant#19258)
  Add automation and script events to logbook filter events (home-assistant#19253)
  Bump aioasuswrt (home-assistant#19229)
  Review comments
  Move check to websocket
  ...

dshokouhi added a commit to dshokouhi/home-assistant that referenced this pull request Dec 25, 2018

Add automation and script events to logbook filter events (home-assis…
…tant#19253)

* Add automation and script events to logbook filter events

* Update logbook.py

* Update logbook.py

* Update logbook tests

* Update test_logbook.py

* Update test_logbook.py

* Update test_logbook.py

* Update test_logbook.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment