[telepathy-gabble/master] search/unextended.py: use q.forbid_events instead of connecting to the unexpected D-Bus signal
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Wed Aug 26 09:21:57 PDT 2009
---
tests/twisted/search/unextended.py | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/tests/twisted/search/unextended.py b/tests/twisted/search/unextended.py
index 2763daf..bf60239 100644
--- a/tests/twisted/search/unextended.py
+++ b/tests/twisted/search/unextended.py
@@ -194,10 +194,7 @@ def cancelled_while_in_progress(q, bus, conn, requests, stream, server):
assert state == cs.SEARCH_FAILED, (state, cs.SEARCH_FAILED)
# Now the server sends us the results; SearchResultReceived shouldn't fire
- def srr_cb(chan, contact, vcard):
- assert False, "SearchResultReceived shouldn't fire after Stop()"
-
- c_search.connect_to_signal('SearchResultReceived', srr_cb)
+ q.forbid_events([EventPattern('dbus-signal', signal='SearchResultReceived')])
send_results(stream, iq)
@@ -206,10 +203,7 @@ def cancelled_while_in_progress(q, bus, conn, requests, stream, server):
# Hooray! We survived. Now let's call Stop again; it should succeed but do
# nothing.
- def search_state_changed_cb(chan, state, reason, details):
- assert False, "SearchStateChanged shouldn't fire"
-
- c_search.connect_to_signal('SearchStateChanged', search_state_changed_cb)
+ q.forbid_events([EventPattern('dbus-signal', signal='SearchStateChanged')])
call_async(q, c_search, 'Stop')
ssc = q.expect('dbus-return', method='Stop')
--
1.5.6.5
More information about the telepathy-commits
mailing list