Skip to content
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

Minimize D-Bus requirements for tests #5265

Merged
merged 1 commit into from
Aug 22, 2024
Merged

Conversation

agners
Copy link
Member

@agners agners commented Aug 22, 2024

Proposed change

This PR minimizes the D-Bus requirements for tests. It does this by using dbus-daemon directly instead of dbus-launch. The latter is meant for graphical applications and therefor has X11 dependencies. It also leaves the D-Bus daemon running after the tests are done. This will accumulate dbus-daemon processes over time which is not ideal.

I've also considered using dbus-run-session since it is meant to launch processes with a private D-Bus session. For Python tests one could launch it like so:
dbus-run-session -- python3 -m pytest ...

Then DBUS_SESSION_BUS_ADDRESS would be used automatically by the MessageBus class. However, to keep the current behavior of the tests, launching the D-Bus daemon manually is the better option.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New feature (which adds functionality to the supervisor)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:
  • Link to cli pull request:

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
  • The code has been formatted using Ruff (ruff format supervisor tests)
  • Tests have been added to verify that the new code works.

If API endpoints of add-on configuration are added/changed:

Summary by CodeRabbit

  • New Features
    • Enhanced the dbus_session function to return a session address, improving connection capabilities to the D-Bus session.
    • Updated the dbus_session function for asynchronous execution, optimizing resource management.
  • Bug Fixes
    • Corrected dependency installation in the CI workflow for improved environment setup.

This PR minimizes the D-Bus requirements for tests. It does this by
using dbus-daemon directly instead of dbus-launch. The latter is meant
for graphical applications and therefor has X11 dependencies. It also
leaves the D-Bus daemon running after the tests are done. This will
accumulate dbus-daemon processes over time which is not ideal.

I've also considered using dbus-run-session since it is meant to launch
processes with a private D-Bus session. For Python tests one could
launch it like so:
dbus-run-session -- python3 -m pytest ...

Then `DBUS_SESSION_BUS_ADDRESS` would be used automatically by the
`MessageBus` class. However, to keep the current behavior of the tests,
launching the D-Bus daemon manually is the better option.
@agners agners added ci Changes to our CI configuration files and scripts chore labels Aug 22, 2024
Copy link

coderabbitai bot commented Aug 22, 2024

Walkthrough

Walkthrough

The changes involve modifications to the GitHub Actions workflow and the test fixture setup for D-Bus sessions. The workflow file has updated its system dependency installation command from dbus-x11 to dbus-daemon. In the test setup, the dbus_session function now returns a session address as a string and employs subprocess.Popen for asynchronous execution. Correspondingly, the dbus_session_bus fixture has been adjusted to accept this session address.

Changes

Files Change Summary
.github/workflows/ci.yaml Updated dependency installation from dbus-x11 to dbus-daemon in the workflow configuration file.
tests/conftest.py Modified dbus_session function to return a session address string and changed its implementation to use subprocess.Popen. Updated dbus_session_bus to accept the address.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@mdegat01
Copy link
Contributor

We should follow this up with a change to devcontainer and switch what package it is installing here: https://github.com/home-assistant/devcontainer/blob/7ae0e50db3cadb3dca003175baa5288801e5874a/supervisor/Dockerfile#L15

But tested in current devcontainer and still works fine because dbus-x11 depends on the other

@agners
Copy link
Member Author

agners commented Aug 22, 2024

We should follow this up with a change to devcontainer and switch what package it is installing here: https://github.com/home-assistant/devcontainer/blob/7ae0e50db3cadb3dca003175baa5288801e5874a/supervisor/Dockerfile#L15

Addressed with: home-assistant/devcontainer#100

@agners agners merged commit 695a23a into main Aug 22, 2024
21 checks passed
@agners agners deleted the minimize-dbus-requirements branch August 22, 2024 17:04
@github-actions github-actions bot locked and limited conversation to collaborators Aug 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
chore ci Changes to our CI configuration files and scripts cla-signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants