tests

test/widget/test_iwd.py

@@ -27,9 +27,8 @@
 
 import pytest
 from dbus_fast import Variant
-from dbus_fast._private.address import get_session_bus_address
 from dbus_fast.aio import MessageBus
-from dbus_fast.constants import PropertyAccess
+from dbus_fast.constants import BusType, PropertyAccess
 from dbus_fast.service import ServiceInterface, dbus_property, method
 from libqtile.bar import Bar
 from libqtile.config import Screen
@@ -47,6 +46,11 @@
 from test.helpers import Retry
 
 
+class ForceSessionBusType:
+    SESSION = BusType.SESSION
+    SYSTEM = BusType.SESSION
+
+
 class Device(ServiceInterface):
     def __init__(self, *args, device_name="", powered=True, **kwargs):
         ServiceInterface.__init__(self, IWD_DEVICE, *args, **kwargs)
@@ -241,12 +245,8 @@ def dbus_thread(monkeypatch):
 @pytest.fixture
 def widget(monkeypatch):
     """Patch the widget to use the fake dbus service."""
-
-    def force_session_bus(bus_type):
-        return get_session_bus_address()
-
     # Make dbus_fast always return the session bus address even if system bus is requested
-    monkeypatch.setattr("dbus_fast.message_bus.get_bus_address", force_session_bus)
+    monkeypatch.setattr("qtile_extras.widget.iwd.BusType", ForceSessionBusType)
 
     yield IWD
 

test/widget/test_mpris2.py

@@ -29,9 +29,9 @@
 import libqtile.confreader
 import libqtile.layout
 import pytest
+from dbus_fast import Variant
 from dbus_fast.aio import MessageBus
 from dbus_fast.constants import PropertyAccess
-from dbus_fast.message import Variant
 from dbus_fast.service import ServiceInterface, dbus_property, method
 
 import qtile_extras.widget.mpris2widget as mp