Control: block 1058116 by 1057564 Control: tags 1058116 + patch pending Control: tags 1057564 + patch
On Sat, 30 Dec 2023 at 21:18:37 +0000, Simon McVittie wrote: > Because you can't clone a merged bug, I'm unmerging the two equivalent > FTBFS bug reports, and arbitrarily choosing to use: > > - #1058116 to represent the gnome-bluetooth3 test failure with dbusmock > 0.30.0-2, which is genuinely a gnome-bluetooth3 bug, for which I've > proposed a fix in > https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/merge_requests/175. > The symptom is that multiple tests time out. This fix for #1058116 is pending in gnome-team git, but cannot usefully be uploaded until the other bug is fixed: > - #1057564 to represent the gnome-bluetooth3 test failure with dbusmock > 0.30.1-1, even after applying GNOME/gnome-bluetooth!175, which as far > as I can see is a dbusmock regression, reported as > https://github.com/martinpitt/python-dbusmock/issues/193 > (I haven't tested a patch for this, I hope it's as simple as removing > the obsolete 3rd argument in one call to PairDevice()). That is indeed sufficient. Please see https://github.com/martinpitt/python-dbusmock/pull/194 or the attached patch. smcv
>From e5679687939375265a0d080148cc129feade02e1 Mon Sep 17 00:00:00 2001 From: Simon McVittie <s...@debian.org> Date: Sat, 30 Dec 2023 23:58:08 +0000 Subject: [PATCH] bluez5: Fix invalid arguments to PairDevice The third (device class) argument to PairDevice was removed in 0.30.1, but this call to it was still passing a third parameter, resulting in an error from dbus-python whenever Pair() was called. This caused a unit test regression in gnome-bluetooth. Fixes: 63264e18 "bluez5: Clean up static default properties, re-drop PairDevice class_ parameter" Bug: https://github.com/martinpitt/python-dbusmock/issues/193 Bug-Debian: https://bugs.debian.org/1057564 Signed-off-by: Simon McVittie <s...@debian.org> --- dbusmock/templates/bluez5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbusmock/templates/bluez5.py b/dbusmock/templates/bluez5.py index 4c590da..5603bd8 100644 --- a/dbusmock/templates/bluez5.py +++ b/dbusmock/templates/bluez5.py @@ -333,7 +333,7 @@ def Pair(device): raise dbus.exceptions.DBusException("Device already paired", name="org.bluez.Error.AlreadyExists") device_address = device.props[DEVICE_IFACE]["Address"] adapter_device_name = Path(device.props[DEVICE_IFACE]["Adapter"]).name - device.PairDevice(adapter_device_name, device_address, MOCK_PHONE_CLASS) + device.PairDevice(adapter_device_name, device_address) @dbus.service.method(DEVICE_IFACE, in_signature="", out_signature="") -- 2.43.0
