Skip to content

Get MyStrom device state before checking support#96004

Merged
balloob merged 4 commits into
home-assistant:devfrom
joostlek:mystrom_95995
Jul 7, 2023
Merged

Get MyStrom device state before checking support#96004
balloob merged 4 commits into
home-assistant:devfrom
joostlek:mystrom_95995

Conversation

@joostlek
Copy link
Copy Markdown
Member

@joostlek joostlek commented Jul 6, 2023 •
edited
Loading

Proposed change

I checked the code in the library (wasn't updated since the config flow), and device.bulb_type is not set, until device.get_state() is called. Which was done in this code, but only after we check for compatibility.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Black (black --fast homeassistant tests)
  • Tests have been added to verify that the new code works.

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

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

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

@home-assistant
Copy link
Copy Markdown
Contributor

home-assistant Bot commented Jul 6, 2023

Hey there @fabaff, mind taking a look at this pull request as it has been labeled with an integration (mystrom) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of mystrom can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign mystrom Removes the current integration label and assignees on the pull request, add the integration domain after the command.

This was referenced Jul 6, 2023
Closed
Closed
joostlek
joostlek commented Jul 6, 2023
View reviewed changes
Comment thread homeassistant/components/mystrom/__init__.py
Comment on lines +35 to +40
def _get_mystrom_bulb(host: str, mac: str) -> MyStromBulb:
return MyStromBulb(host, mac)


def _get_mystrom_switch(host: str) -> MyStromSwitch:
return MyStromSwitch(host)
Copy link
Copy Markdown
Member Author

@joostlek joostlek Jul 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I currently use this method to be able to inject mocks in the tests. Any other method would be preferred!

Copy link
Copy Markdown
Member

@balloob balloob Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do you need to make it a function instead of calling constructor right away like it was ?

Copy link
Copy Markdown
Member Author

@joostlek joostlek Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because I want to inject a mock in the tests and I could not figure out how to patch a constructor call. (the mock is now used to mock the behaviour of the external library better, since the current tests arent representing this well)

@joostlek joostlek marked this pull request as ready for review July 7, 2023 09:08
@joostlek joostlek requested a review from fabaff as a code owner July 7, 2023 09:08
@joostlek joostlek added this to the 2023.7.2 milestone Jul 7, 2023
balloob
balloob reviewed Jul 7, 2023
View reviewed changes
Comment thread homeassistant/components/mystrom/__init__.py
await device.get_state()
except MyStromConnectionError as err:
_LOGGER.error("No route to myStrom plug: %s", info["ip"])
raise ConfigEntryNotReady() from err
Copy link
Copy Markdown
Member

@balloob balloob Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see this happening anymore ? This is important logic to make sure we retry if we cannot connect.

Copy link
Copy Markdown
Member

@balloob balloob Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see it now, nevermind.

@balloob balloob merged commit ddd0d3f into home-assistant:dev Jul 7, 2023
@joostlek joostlek deleted the mystrom_95995 branch July 7, 2023 15:26
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 8, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@balloob balloob balloob approved these changes

@fabaff fabaff Awaiting requested review from fabaff fabaff is a code owner

Assignees

@fabaff fabaff

Labels

bugfix cherry-picked cla-signed integration: mystrom Quality Scale: No score small-pr PRs with less than 30 lines.

Projects

None yet

Milestone

2023.7.2

Development

Successfully merging this pull request may close these issues.

Integration failed to set up: [IP] is not a myStrom bulb nor myStrom LED Strip

3 participants

@joostlek @balloob @fabaff