diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-23 12:19:52 +0200 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-23 12:23:32 +0200 |
commit | bb98796536886e3ec9ab0a2139c1879eea273497 (patch) | |
tree | c41cf6506063328461054faeec57b35b5148dba8 | |
parent | 73306ac9283b79aed76e2bc2d8623fc7bbe1daef (diff) | |
download | telepathy-idle-bb98796536886e3ec9ab0a2139c1879eea273497.tar.gz |
tests: move D-Bus signal handler to idletest
Gabble moved the equivalent test handler out of servicetest a while ago.
-rw-r--r-- | tests/twisted/idletest.py | 17 | ||||
-rw-r--r-- | tests/twisted/servicetest.py | 16 |
2 files changed, 17 insertions, 16 deletions
diff --git a/tests/twisted/idletest.py b/tests/twisted/idletest.py index b1ad857..d60e774 100644 --- a/tests/twisted/idletest.py +++ b/tests/twisted/idletest.py @@ -7,6 +7,7 @@ import os import sys import dbus import servicetest +from servicetest import (unwrap, Event) import twisted from twisted.words.protocols import irc from twisted.internet import reactor, ssl @@ -238,6 +239,22 @@ def exec_test_deferred (funs, params, protocol=None, timeout=None): # conn = make_connection(bus, queue.append, params) (server, port) = start_server(queue.append, protocol=protocol) + bus.add_signal_receiver( + lambda *args, **kw: + queue.append( + Event('dbus-signal', + path=unwrap(kw['path']), + signal=kw['member'], args=map(unwrap, args), + interface=kw['interface'])), + None, # signal name + None, # interface + None, + path_keyword='path', + member_keyword='member', + interface_keyword='interface', + byte_arrays=True + ) + error = None try: diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py index 3065e15..3e6a16b 100644 --- a/tests/twisted/servicetest.py +++ b/tests/twisted/servicetest.py @@ -404,22 +404,6 @@ def make_connection(bus, event_func, name, proto, params): proto, params) conn = wrap_connection(bus.get_object(connection_name, connection_path)) - bus.add_signal_receiver( - lambda *args, **kw: - event_func( - Event('dbus-signal', - path=unwrap(kw['path']), - signal=kw['member'], args=map(unwrap, args), - interface=kw['interface'])), - None, # signal name - None, # interface - cm._named_service, - path_keyword='path', - member_keyword='member', - interface_keyword='interface', - byte_arrays=True - ) - return conn def make_channel_proxy(conn, path, iface): |