[Telepathy-commits] [telepathy-salut/master] test-offer-private-stream-tube.py: tube and tubes channels are now announced together

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Wed Mar 11 09:15:31 PDT 2009


---
 .../avahi/test-offer-private-stream-tube.py        |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/twisted/avahi/test-offer-private-stream-tube.py b/tests/twisted/avahi/test-offer-private-stream-tube.py
index c81f7a4..b9b355c 100644
--- a/tests/twisted/avahi/test-offer-private-stream-tube.py
+++ b/tests/twisted/avahi/test-offer-private-stream-tube.py
@@ -285,16 +285,14 @@ def test(q, bus, conn):
 
     assert len(ret.value) == 2 # CreateChannel returns 2 values: o, a{sv}
     new_chan_path = ret.value[0]
-    new_chan_prop_asv = ret.value[1]
+    stream_tube_channel_properties = ret.value
     # The path of the Channel.Type.Tubes object MUST be different to the path
     # of the Channel.Type.StreamTube object !
     assert chan_path != new_chan_path
 
-    check_NewChannel_signal(old_sig.args, "StreamTube.DRAFT", \
-            new_chan_path, handle)
-    check_NewChannels_signal(conn, new_sig.args, "StreamTube.DRAFT", new_chan_path, \
-            handle, contact_name, conn.GetSelfHandle())
-    stream_tube_channel_properties = new_sig.args[0][0]
+    channels = new_sig.args[0]
+    # tubes and tube channels are announced
+    assert len(channels) == 2
 
     check_conn_properties(q, bus, conn,
             [old_tubes_channel_properties, stream_tube_channel_properties])
-- 
1.5.6.5




More information about the telepathy-commits mailing list