home-assistant/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-12-11 03:03:18 -06:00
Code Issues Packages Projects Releases 484 Wiki Activity

Bump dbus-fast from 2.45.1 to 3.1.2 (#6317)

Browse Source 
* Bump dbus-fast from 2.45.1 to 3.1.2

Bumps [dbus-fast](https://github.com/bluetooth-devices/dbus-fast) from 2.45.1 to 3.1.2.
- [Release notes](https://github.com/bluetooth-devices/dbus-fast/releases)
- [Changelog](https://github.com/Bluetooth-Devices/dbus-fast/blob/main/CHANGELOG.md)
- [Commits](https://github.com/bluetooth-devices/dbus-fast/compare/v2.45.1...v3.1.2)

---
updated-dependencies:
- dependency-name: dbus-fast
  dependency-version: 3.1.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update unit tests for dbus-fast 3.1.2 changes

* Fix type annotations

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
dependabot[bot] 2025-11-25 16:25:06 +01:00 committed by GitHub
parent 2b2aedae60
commit 6042694d84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -28,5 +28,5 @@ securetar==2025.2.1
sentry-sdk==2.46.0 sentry-sdk==2.46.0
setuptools==80.9.0 setuptools==80.9.0
voluptuous==0.15.2 voluptuous==0.15.2
dbus-fast==2.45.1 dbus-fast==3.1.2
zlib-fast==0.2.1 zlib-fast==0.2.1

4
supervisor/dbus/resolved.py
View File

@ -75,7 +75,7 @@ class Resolved(DBusInterfaceProxy):
@dbus_property @dbus_property
def current_dns_server( def current_dns_server(
self, self,
) -> list[tuple[int, DNSAddressFamily, bytes]] | None: ) -> tuple[int, DNSAddressFamily, bytes] | None:
"""Return current DNS server.""" """Return current DNS server."""
return self.properties[DBUS_ATTR_CURRENT_DNS_SERVER] return self.properties[DBUS_ATTR_CURRENT_DNS_SERVER]
@ -83,7 +83,7 @@ class Resolved(DBusInterfaceProxy):
@dbus_property @dbus_property
def current_dns_server_ex( def current_dns_server_ex(
self, self,
) -> list[tuple[int, DNSAddressFamily, bytes, int, str]] | None: ) -> tuple[int, DNSAddressFamily, bytes, int, str] | None:
"""Return current DNS server including port and server name.""" """Return current DNS server including port and server name."""
return self.properties[DBUS_ATTR_CURRENT_DNS_SERVER_EX] return self.properties[DBUS_ATTR_CURRENT_DNS_SERVER_EX]

36
tests/dbus/test_resolved.py
View File

@ -41,51 +41,51 @@ async def test_dbus_resolved_info(
assert resolved.dns_over_tls == DNSOverTLSEnabled.NO assert resolved.dns_over_tls == DNSOverTLSEnabled.NO
assert len(resolved.dns) == 2 assert len(resolved.dns) == 2
assert resolved.dns[0] == [0, 2, inet_aton("127.0.0.1")] assert resolved.dns[0] == (0, 2, inet_aton("127.0.0.1"))
assert resolved.dns[1] == [0, 10, inet_pton(AF_INET6, "::1")] assert resolved.dns[1] == (0, 10, inet_pton(AF_INET6, "::1"))
assert len(resolved.dns_ex) == 2 assert len(resolved.dns_ex) == 2
assert resolved.dns_ex[0] == [0, 2, inet_aton("127.0.0.1"), 0, ""] assert resolved.dns_ex[0] == (0, 2, inet_aton("127.0.0.1"), 0, "")
assert resolved.dns_ex[1] == [0, 10, inet_pton(AF_INET6, "::1"), 0, ""] assert resolved.dns_ex[1] == (0, 10, inet_pton(AF_INET6, "::1"), 0, "")
assert len(resolved.fallback_dns) == 2 assert len(resolved.fallback_dns) == 2
assert resolved.fallback_dns[0] == [0, 2, inet_aton("1.1.1.1")] assert resolved.fallback_dns[0] == (0, 2, inet_aton("1.1.1.1"))
assert resolved.fallback_dns[1] == [ assert resolved.fallback_dns[1] == (
0, 0,
10, 10,
inet_pton(AF_INET6, "2606:4700:4700::1111"), inet_pton(AF_INET6, "2606:4700:4700::1111"),
] )
assert len(resolved.fallback_dns_ex) == 2 assert len(resolved.fallback_dns_ex) == 2
assert resolved.fallback_dns_ex[0] == [ assert resolved.fallback_dns_ex[0] == (
0, 0,
2, 2,
inet_aton("1.1.1.1"), inet_aton("1.1.1.1"),
0, 0,
"cloudflare-dns.com", "cloudflare-dns.com",
] )
assert resolved.fallback_dns_ex[1] == [ assert resolved.fallback_dns_ex[1] == (
0, 0,
10, 10,
inet_pton(AF_INET6, "2606:4700:4700::1111"), inet_pton(AF_INET6, "2606:4700:4700::1111"),
0, 0,
"cloudflare-dns.com", "cloudflare-dns.com",
] )
assert resolved.current_dns_server == [0, 2, inet_aton("127.0.0.1")] assert resolved.current_dns_server == (0, 2, inet_aton("127.0.0.1"))
assert resolved.current_dns_server_ex == [ assert resolved.current_dns_server_ex == (
0, 0,
2, 2,
inet_aton("127.0.0.1"), inet_aton("127.0.0.1"),
0, 0,
"", "",
] )
assert len(resolved.domains) == 1 assert len(resolved.domains) == 1
assert resolved.domains[0] == [0, "local.hass.io", False] assert resolved.domains[0] == (0, "local.hass.io", False)
assert resolved.transaction_statistics == [0, 100000] assert resolved.transaction_statistics == (0, 100000)
assert resolved.cache_statistics == [10, 50000, 10000] assert resolved.cache_statistics == (10, 50000, 10000)
assert resolved.dnssec == DNSSECValidation.NO assert resolved.dnssec == DNSSECValidation.NO
assert resolved.dnssec_statistics == [0, 0, 0, 0] assert resolved.dnssec_statistics == (0, 0, 0, 0)
assert resolved.dnssec_supported is False assert resolved.dnssec_supported is False
assert resolved.dnssec_negative_trust_anchors == [ assert resolved.dnssec_negative_trust_anchors == [
"168.192.in-addr.arpa", "168.192.in-addr.arpa",

8
tests/dbus/test_systemd.py
View File

@ -185,10 +185,10 @@ async def test_start_transient_unit(
"tmp-test.mount", "tmp-test.mount",
"fail", "fail",
[ [
["Description", Variant("s", "Test")], ("Description", Variant("s", "Test")),
["What", Variant("s", "//homeassistant/config")], ("What", Variant("s", "//homeassistant/config")),
["Type", Variant("s", "cifs")], ("Type", Variant("s", "cifs")),
["Options", Variant("s", "username=homeassistant,password=password")], ("Options", Variant("s", "username=homeassistant,password=password")),
], ],
[], [],
) )

36
tests/dbus_service_mocks/resolved.py
View File

@ -45,8 +45,8 @@ class Resolved(DBusServiceMock):
def DNS(self) -> "a(iiay)": def DNS(self) -> "a(iiay)":
"""Get DNS.""" """Get DNS."""
return [ return [
[0, 2, bytes([127, 0, 0, 1])], (0, 2, bytes([127, 0, 0, 1])),
[ (
0, 0,
10, 10,
bytes( bytes(
@ -69,15 +69,15 @@ class Resolved(DBusServiceMock):
0x1, 0x1,
] ]
), ),
], ),
] ]
@dbus_property(access=PropertyAccess.READ) @dbus_property(access=PropertyAccess.READ)
def DNSEx(self) -> "a(iiayqs)": def DNSEx(self) -> "a(iiayqs)":
"""Get DNSEx.""" """Get DNSEx."""
return [ return [
[0, 2, bytes([127, 0, 0, 1]), 0, ""], (0, 2, bytes([127, 0, 0, 1]), 0, ""),
[ (
0, 0,
10, 10,
bytes( bytes(
@ -102,15 +102,15 @@ class Resolved(DBusServiceMock):
), ),
0, 0,
"", "",
], ),
] ]
@dbus_property(access=PropertyAccess.READ) @dbus_property(access=PropertyAccess.READ)
def FallbackDNS(self) -> "a(iiay)": def FallbackDNS(self) -> "a(iiay)":
"""Get FallbackDNS.""" """Get FallbackDNS."""
return [ return [
[0, 2, bytes([1, 1, 1, 1])], (0, 2, bytes([1, 1, 1, 1])),
[ (
0, 0,
10, 10,
bytes( bytes(
@ -133,15 +133,15 @@ class Resolved(DBusServiceMock):
0x11, 0x11,
] ]
), ),
], ),
] ]
@dbus_property(access=PropertyAccess.READ) @dbus_property(access=PropertyAccess.READ)
def FallbackDNSEx(self) -> "a(iiayqs)": def FallbackDNSEx(self) -> "a(iiayqs)":
"""Get FallbackDNSEx.""" """Get FallbackDNSEx."""
return [ return [
[0, 2, bytes([1, 1, 1, 1]), 0, "cloudflare-dns.com"], (0, 2, bytes([1, 1, 1, 1]), 0, "cloudflare-dns.com"),
[ (
0, 0,
10, 10,
bytes( bytes(
@ -166,33 +166,33 @@ class Resolved(DBusServiceMock):
), ),
0, 0,
"cloudflare-dns.com", "cloudflare-dns.com",
], ),
] ]
@dbus_property(access=PropertyAccess.READ) @dbus_property(access=PropertyAccess.READ)
def CurrentDNSServer(self) -> "(iiay)": def CurrentDNSServer(self) -> "(iiay)":
"""Get CurrentDNSServer.""" """Get CurrentDNSServer."""
return [0, 2, bytes([127, 0, 0, 1])] return (0, 2, bytes([127, 0, 0, 1]))
@dbus_property(access=PropertyAccess.READ) @dbus_property(access=PropertyAccess.READ)
def CurrentDNSServerEx(self) -> "(iiayqs)": def CurrentDNSServerEx(self) -> "(iiayqs)":
"""Get CurrentDNSServerEx.""" """Get CurrentDNSServerEx."""
return [0, 2, bytes([127, 0, 0, 1]), 0, ""] return (0, 2, bytes([127, 0, 0, 1]), 0, "")
@dbus_property(access=PropertyAccess.READ) @dbus_property(access=PropertyAccess.READ)
def Domains(self) -> "a(isb)": def Domains(self) -> "a(isb)":
"""Get Domains.""" """Get Domains."""
return [[0, "local.hass.io", False]] return [(0, "local.hass.io", False)]
@dbus_property(access=PropertyAccess.READ) @dbus_property(access=PropertyAccess.READ)
def TransactionStatistics(self) -> "(tt)": def TransactionStatistics(self) -> "(tt)":
"""Get TransactionStatistics.""" """Get TransactionStatistics."""
return [0, 100000] return (0, 100000)
@dbus_property(access=PropertyAccess.READ) @dbus_property(access=PropertyAccess.READ)
def CacheStatistics(self) -> "(ttt)": def CacheStatistics(self) -> "(ttt)":
"""Get CacheStatistics.""" """Get CacheStatistics."""
return [10, 50000, 10000] return (10, 50000, 10000)
@dbus_property(access=PropertyAccess.READ) @dbus_property(access=PropertyAccess.READ)
def DNSSEC(self) -> "s": def DNSSEC(self) -> "s":
@ -202,7 +202,7 @@ class Resolved(DBusServiceMock):
@dbus_property(access=PropertyAccess.READ) @dbus_property(access=PropertyAccess.READ)
def DNSSECStatistics(self) -> "(tttt)": def DNSSECStatistics(self) -> "(tttt)":
"""Get DNSSECStatistics.""" """Get DNSSECStatistics."""
return [0, 0, 0, 0] return (0, 0, 0, 0)
@dbus_property(access=PropertyAccess.READ) @dbus_property(access=PropertyAccess.READ)
def DNSSECSupported(self) -> "b": def DNSSECSupported(self) -> "b":

60
tests/mounts/test_manager.py
View File

@ -119,10 +119,10 @@ async def test_load(
"mnt-data-supervisor-mounts-backup_test.mount", "mnt-data-supervisor-mounts-backup_test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "noserverino,guest")], ("Options", Variant("s", "noserverino,guest")),
["Type", Variant("s", "cifs")], ("Type", Variant("s", "cifs")),
["Description", Variant("s", "Supervisor cifs mount: backup_test")], ("Description", Variant("s", "Supervisor cifs mount: backup_test")),
["What", Variant("s", "//backup.local/backups")], ("What", Variant("s", "//backup.local/backups")),
], ],
[], [],
), ),
@ -130,10 +130,10 @@ async def test_load(
"mnt-data-supervisor-mounts-media_test.mount", "mnt-data-supervisor-mounts-media_test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "soft,timeo=200")], ("Options", Variant("s", "soft,timeo=200")),
["Type", Variant("s", "nfs")], ("Type", Variant("s", "nfs")),
["Description", Variant("s", "Supervisor nfs mount: media_test")], ("Description", Variant("s", "Supervisor nfs mount: media_test")),
["What", Variant("s", "media.local:/media")], ("What", Variant("s", "media.local:/media")),
], ],
[], [],
), ),
@ -141,12 +141,12 @@ async def test_load(
"mnt-data-supervisor-media-media_test.mount", "mnt-data-supervisor-media-media_test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "bind")], ("Options", Variant("s", "bind")),
[ (
"Description", "Description",
Variant("s", "Supervisor bind mount: bind_media_test"), Variant("s", "Supervisor bind mount: bind_media_test"),
], ),
["What", Variant("s", "/mnt/data/supervisor/mounts/media_test")], ("What", Variant("s", "/mnt/data/supervisor/mounts/media_test")),
], ],
[], [],
), ),
@ -198,10 +198,10 @@ async def test_load_share_mount(
"mnt-data-supervisor-mounts-share_test.mount", "mnt-data-supervisor-mounts-share_test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "soft,timeo=200")], ("Options", Variant("s", "soft,timeo=200")),
["Type", Variant("s", "nfs")], ("Type", Variant("s", "nfs")),
["Description", Variant("s", "Supervisor nfs mount: share_test")], ("Description", Variant("s", "Supervisor nfs mount: share_test")),
["What", Variant("s", "share.local:/share")], ("What", Variant("s", "share.local:/share")),
], ],
[], [],
), ),
@ -209,9 +209,9 @@ async def test_load_share_mount(
"mnt-data-supervisor-share-share_test.mount", "mnt-data-supervisor-share-share_test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "bind")], ("Options", Variant("s", "bind")),
["Description", Variant("s", "Supervisor bind mount: bind_share_test")], ("Description", Variant("s", "Supervisor bind mount: bind_share_test")),
["What", Variant("s", "/mnt/data/supervisor/mounts/share_test")], ("What", Variant("s", "/mnt/data/supervisor/mounts/share_test")),
], ],
[], [],
), ),
@ -318,12 +318,12 @@ async def test_mount_failed_during_load(
"mnt-data-supervisor-media-media_test.mount", "mnt-data-supervisor-media-media_test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "ro,bind")], ("Options", Variant("s", "ro,bind")),
[ (
"Description", "Description",
Variant("s", "Supervisor bind mount: emergency_media_test"), Variant("s", "Supervisor bind mount: emergency_media_test"),
], ),
["What", Variant("s", "/mnt/data/supervisor/emergency/media_test")], ("What", Variant("s", "/mnt/data/supervisor/emergency/media_test")),
], ],
[], [],
) )
@ -634,10 +634,10 @@ async def test_reload_mounts_attempts_initial_mount(
"mnt-data-supervisor-mounts-media_test.mount", "mnt-data-supervisor-mounts-media_test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "soft,timeo=200")], ("Options", Variant("s", "soft,timeo=200")),
["Type", Variant("s", "nfs")], ("Type", Variant("s", "nfs")),
["Description", Variant("s", "Supervisor nfs mount: media_test")], ("Description", Variant("s", "Supervisor nfs mount: media_test")),
["What", Variant("s", "media.local:/media")], ("What", Variant("s", "media.local:/media")),
], ],
[], [],
), ),
@ -645,9 +645,9 @@ async def test_reload_mounts_attempts_initial_mount(
"mnt-data-supervisor-media-media_test.mount", "mnt-data-supervisor-media-media_test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "bind")], ("Options", Variant("s", "bind")),
["Description", Variant("s", "Supervisor bind mount: bind_media_test")], ("Description", Variant("s", "Supervisor bind mount: bind_media_test")),
["What", Variant("s", "/mnt/data/supervisor/mounts/media_test")], ("What", Variant("s", "/mnt/data/supervisor/mounts/media_test")),
], ],
[], [],
), ),

50
tests/mounts/test_mount.py
View File

@ -105,7 +105,7 @@ async def test_cifs_mount(
"mnt-data-supervisor-mounts-test.mount", "mnt-data-supervisor-mounts-test.mount",
"fail", "fail",
[ [
[ (
"Options", "Options",
Variant( Variant(
"s", "s",
@ -117,10 +117,10 @@ async def test_cifs_mount(
] ]
), ),
), ),
], ),
["Type", Variant("s", "cifs")], ("Type", Variant("s", "cifs")),
["Description", Variant("s", "Supervisor cifs mount: test")], ("Description", Variant("s", "Supervisor cifs mount: test")),
["What", Variant("s", "//test.local/camera")], ("What", Variant("s", "//test.local/camera")),
], ],
[], [],
) )
@ -177,10 +177,10 @@ async def test_cifs_mount_read_only(
"mnt-data-supervisor-mounts-test.mount", "mnt-data-supervisor-mounts-test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "ro,noserverino,guest")], ("Options", Variant("s", "ro,noserverino,guest")),
["Type", Variant("s", "cifs")], ("Type", Variant("s", "cifs")),
["Description", Variant("s", "Supervisor cifs mount: test")], ("Description", Variant("s", "Supervisor cifs mount: test")),
["What", Variant("s", "//test.local/camera")], ("What", Variant("s", "//test.local/camera")),
], ],
[], [],
) )
@ -237,10 +237,10 @@ async def test_nfs_mount(
"mnt-data-supervisor-mounts-test.mount", "mnt-data-supervisor-mounts-test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "port=1234,soft,timeo=200")], ("Options", Variant("s", "port=1234,soft,timeo=200")),
["Type", Variant("s", "nfs")], ("Type", Variant("s", "nfs")),
["Description", Variant("s", "Supervisor nfs mount: test")], ("Description", Variant("s", "Supervisor nfs mount: test")),
["What", Variant("s", "test.local:/media/camera")], ("What", Variant("s", "test.local:/media/camera")),
], ],
[], [],
) )
@ -283,10 +283,10 @@ async def test_nfs_mount_read_only(
"mnt-data-supervisor-mounts-test.mount", "mnt-data-supervisor-mounts-test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "ro,port=1234,soft,timeo=200")], ("Options", Variant("s", "ro,port=1234,soft,timeo=200")),
["Type", Variant("s", "nfs")], ("Type", Variant("s", "nfs")),
["Description", Variant("s", "Supervisor nfs mount: test")], ("Description", Variant("s", "Supervisor nfs mount: test")),
["What", Variant("s", "test.local:/media/camera")], ("What", Variant("s", "test.local:/media/camera")),
], ],
[], [],
) )
@ -331,10 +331,10 @@ async def test_load(
"mnt-data-supervisor-mounts-test.mount", "mnt-data-supervisor-mounts-test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "noserverino,guest")], ("Options", Variant("s", "noserverino,guest")),
["Type", Variant("s", "cifs")], ("Type", Variant("s", "cifs")),
["Description", Variant("s", "Supervisor cifs mount: test")], ("Description", Variant("s", "Supervisor cifs mount: test")),
["What", Variant("s", "//test.local/share")], ("What", Variant("s", "//test.local/share")),
], ],
[], [],
) )
@ -736,10 +736,10 @@ async def test_mount_fails_if_down(
"mnt-data-supervisor-mounts-test.mount", "mnt-data-supervisor-mounts-test.mount",
"fail", "fail",
[ [
["Options", Variant("s", "port=1234,soft,timeo=200")], ("Options", Variant("s", "port=1234,soft,timeo=200")),
["Type", Variant("s", "nfs")], ("Type", Variant("s", "nfs")),
["Description", Variant("s", "Supervisor nfs mount: test")], ("Description", Variant("s", "Supervisor nfs mount: test")),
["What", Variant("s", "test.local:/media/camera")], ("What", Variant("s", "test.local:/media/camera")),
], ],
[], [],
) )