summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2011-04-28 12:48:14 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-04-28 12:48:14 +0100
commit60190192661bb53d24c002ffa4d2ff5bbf773e74 (patch)
tree394840ca5fd21cf38a34b2785b2e11f1ab7a6ca6 /tests
parentd60e070a47af84e0ee7d427c5d814ce27327ea17 (diff)
downloadtelepathy-salut-60190192661bb53d24c002ffa4d2ff5bbf773e74.tar.gz
saluttest: remove the NOC signal handler when finished with
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'tests')
-rw-r--r--tests/twisted/saluttest.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/twisted/saluttest.py b/tests/twisted/saluttest.py
index 9418f9fd..cc631156 100644
--- a/tests/twisted/saluttest.py
+++ b/tests/twisted/saluttest.py
@@ -66,10 +66,10 @@ def ensure_avahi_is_running():
def name_owner_changed_cb(name, old_owner, new_owner):
loop.quit()
- bus.add_signal_receiver(name_owner_changed_cb,
- signal_name='NameOwnerChanged',
- dbus_interface='org.freedesktop.DBus',
- arg0='org.freedesktop.Avahi')
+ noc = bus.add_signal_receiver(name_owner_changed_cb,
+ signal_name='NameOwnerChanged',
+ dbus_interface='org.freedesktop.DBus',
+ arg0='org.freedesktop.Avahi')
# Cannot use D-Bus activation because we have no way to pass to activated
# clients the address of the system bus and we cannot host the service in
@@ -81,6 +81,8 @@ def ensure_avahi_is_running():
loop.run()
+ noc.remove()
+
def exec_test_deferred (fun, params, protocol=None, timeout=None,
make_conn=True):
colourer = None