Attachment 51461 Details for Bug 41090 – Make the regression tests work with D-Bus >= 1.5.6

[patch] Make the regression tests work with D-Bus >= 1.5.6

0001-Make-the-regression-tests-work-with-D-Bus-1.5.6.patch (text/plain), 1.14 KB, created by Simon McVittie on 2011-09-21 11:28:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-09-21 11:28:21 UTC

Size: 1.14 KB

patch

obsolete

>From ee1687b6fd773a809569e9d64abc01532f1402c0 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 21 Sep 2011 19:24:13 +0100
>Subject: [PATCH] Make the regression tests work with D-Bus >= 1.5.6
>
>The tests rely on being able to eavesdrop. Since D-Bus 1.5.6, normal
>match rules do not eavesdrop, even if allowed: you have to specifically
>ask for it.
>---
> tests/twisted/servicetest.py |    9 ++++++++-
> 1 files changed, 8 insertions(+), 1 deletions(-)
>
>diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py
>index 4ceaf64..c1d292c 100644
>--- a/tests/twisted/servicetest.py
>+++ b/tests/twisted/servicetest.py
>@@ -314,7 +314,14 @@ class IteratingEventQueue(BaseEventQueue):
>             bus.add_message_filter(self._dbus_dev_null)
>             return
> 
>-        bus.add_match_string("")    # eavesdrop, like dbus-monitor does
>+        try:
>+            # for dbus > 1.5
>+            bus.add_match_string("eavesdrop=true")
>+        except dbus.DBusException:
>+            pass
>+
>+        # for dbus 1.4
>+        bus.add_match_string("")
> 
>         bus.add_message_filter(self._dbus_filter_bound_method)
> 
>-- 
>1.7.6.3
>

Actions: View | Splinter Review

Attachments on bug 41090: 51461

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.