diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-23 11:27:52 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-23 11:27:52 +0100 |
| commit | 42cef84969d9f0ac32a90cccaaddc57e221d9950 (patch) | |
| tree | 3c01fdfd31a262c7a375ce84afef471e0364e1ff /tests | |
| parent | d3f11533b226e0ecb0ba4e095732aae882089581 (diff) | |
| parent | 746c6982d06a124b05b439f11d92ae24fa252a40 (diff) | |
Merge branch 'telepathy-mission-control-5.8+'
Diffstat (limited to 'tests')
| -rw-r--r-- | 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 4ceaf64c..c1d292cf 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) |