[Telepathy-commits] [telepathy-salut/master] test-two-private-stream-tubes: use new tube API

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


---
 .../twisted/avahi/test-two-private-stream-tubes.py |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/avahi/test-two-private-stream-tubes.py b/tests/twisted/avahi/test-two-private-stream-tubes.py
index 28d060b..f5a7384 100644
--- a/tests/twisted/avahi/test-two-private-stream-tubes.py
+++ b/tests/twisted/avahi/test-two-private-stream-tubes.py
@@ -209,7 +209,7 @@ def test(q, bus, conn):
 
     assert ({CHANNEL_TYPE: CHANNEL_TYPE_STREAM_TUBE,
              TARGET_HANDLE_TYPE: HT_CONTACT},
-         [TARGET_HANDLE, TARGET_ID, TUBE_PARAMETERS, STREAM_TUBE_SERVICE]
+         [TARGET_HANDLE, TARGET_ID, STREAM_TUBE_SERVICE]
         ) in properties.get('RequestableChannelClasses'),\
                  properties['RequestableChannelClasses']
 
@@ -219,8 +219,7 @@ def test(q, bus, conn):
         CHANNEL_TYPE: CHANNEL_TYPE_STREAM_TUBE,
         TARGET_HANDLE_TYPE: HT_CONTACT,
         TARGET_ID: contact2_name,
-        STREAM_TUBE_SERVICE: 'test',
-        TUBE_PARAMETERS: sample_parameters})
+        STREAM_TUBE_SERVICE: 'test'})
 
     # tubes and tube channels are created on the first connection
     e = q.expect('dbus-signal', signal='NewChannels', path=conn.object.object_path)
@@ -257,7 +256,7 @@ def test(q, bus, conn):
     assert state == TUBE_CHANNEL_STATE_NOT_OFFERED
 
     call_async(q, contact1_stream_tube, 'OfferStreamTube', SOCKET_ADDRESS_TYPE_UNIX,
-            dbus.ByteArray(server_socket_address), SOCKET_ACCESS_CONTROL_LOCALHOST, "")
+            dbus.ByteArray(server_socket_address), SOCKET_ACCESS_CONTROL_LOCALHOST, "", sample_parameters)
 
     _, return_event, new_chans = q.expect_many(
         EventPattern('dbus-signal', signal='TubeChannelStateChanged',
-- 
1.5.6.5




More information about the telepathy-commits mailing list