[telepathy-salut/master] fix tube tests to use latest API
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Fri Jun 26 07:16:28 PDT 2009
---
.../avahi/tubes/test-offer-private-stream-tube.py | 2 +-
.../avahi/tubes/test-two-muc-stream-tubes.py | 4 ++--
.../avahi/tubes/test-two-private-stream-tubes.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/twisted/avahi/tubes/test-offer-private-stream-tube.py b/tests/twisted/avahi/tubes/test-offer-private-stream-tube.py
index d1787b0..e9b748d 100644
--- a/tests/twisted/avahi/tubes/test-offer-private-stream-tube.py
+++ b/tests/twisted/avahi/tubes/test-offer-private-stream-tube.py
@@ -312,7 +312,7 @@ def test(q, bus, conn):
handle, contact_name, 3)
tube_channel.Offer(SOCKET_ADDRESS_TYPE_UNIX, dbus.ByteArray(server_socket_address),
- SOCKET_ACCESS_CONTROL_LOCALHOST, "", {'foo': 'bar'})
+ SOCKET_ACCESS_CONTROL_LOCALHOST, {'foo': 'bar'})
e = q.expect('stream-iq')
iq_tube = xpath.queryForNodes('/iq/tube', e.stanza)[0]
diff --git a/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py b/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
index e26be13..0adaf87 100644
--- a/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
+++ b/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
@@ -354,7 +354,7 @@ def test(q, bus, conn):
call_async(q, contact1_stream_tube, 'Offer',
SOCKET_ADDRESS_TYPE_UNIX, dbus.ByteArray(server_socket_address),
- SOCKET_ACCESS_CONTROL_LOCALHOST, "", sample_parameters)
+ SOCKET_ACCESS_CONTROL_LOCALHOST, sample_parameters)
q.expect_many(
EventPattern('dbus-signal', signal='TubeChannelStateChanged',
@@ -458,7 +458,7 @@ def test(q, bus, conn):
client_transport = e.transport
sig, e = q.expect_many(
- EventPattern('dbus-signal', signal='NewConnection',
+ EventPattern('dbus-signal', signal='NewRemoteConnection',
path=tube1_path),
EventPattern('client-data-received'))
diff --git a/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py b/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py
index d119c9e..73096c9 100644
--- a/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py
+++ b/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py
@@ -261,7 +261,7 @@ def test(q, bus, conn):
assert state == TUBE_CHANNEL_STATE_NOT_OFFERED
call_async(q, contact1_stream_tube, 'Offer', SOCKET_ADDRESS_TYPE_UNIX,
- dbus.ByteArray(server_socket_address), SOCKET_ACCESS_CONTROL_LOCALHOST, "", sample_parameters)
+ dbus.ByteArray(server_socket_address), SOCKET_ACCESS_CONTROL_LOCALHOST, sample_parameters)
_, return_event, new_chans = q.expect_many(
EventPattern('dbus-signal', signal='TubeChannelStateChanged',
@@ -335,7 +335,7 @@ def test(q, bus, conn):
client_transport = e.transport
sig, e = q.expect_many(
- EventPattern('dbus-signal', signal='NewConnection', path=tube1_path),
+ EventPattern('dbus-signal', signal='NewRemoteConnection', path=tube1_path),
EventPattern('client-data-received'))
handle = sig.args[0]
--
1.5.6.5
More information about the telepathy-commits
mailing list