[Telepathy-commits] [telepathy-gabble/master] Remove a hack now that NewChannel is correctly emitted

Marco Barisione marco at barisione.org
Tue Jan 6 08:41:35 PST 2009


---
 tests/twisted/tubes/test-si-fallback.py |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/twisted/tubes/test-si-fallback.py b/tests/twisted/tubes/test-si-fallback.py
index 8a7e39e..fe71b8f 100644
--- a/tests/twisted/tubes/test-si-fallback.py
+++ b/tests/twisted/tubes/test-si-fallback.py
@@ -258,13 +258,8 @@ def test(q, bus, conn, stream):
     assert state == 0 # local pending
 
     # accept the tube
-    channels = filter(lambda x:
-      x[1] == "org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT" and
-      '42' in x[0], # FIXME
-      conn.ListChannels())
-    assert len(channels) == 1
-
-    tube_chan = bus.get_object(conn.bus_name, channels[0][0])
+    ret = q.expect('dbus-signal', signal='NewChannel')
+    tube_chan = bus.get_object(conn.bus_name, ret.args[0])
     tube_iface = dbus.Interface(tube_chan,
         tp_name_prefix + '.Channel.Type.StreamTube.DRAFT')
 
-- 
1.5.6.5




More information about the Telepathy-commits mailing list