diff options
Diffstat (limited to 'tests/twisted/avahi/tubes')
| -rw-r--r-- | tests/twisted/avahi/tubes/request-muc-tubes.py | 12 | ||||
| -rw-r--r-- | tests/twisted/avahi/tubes/tubetestutil.py | 4 | ||||
| -rw-r--r-- | tests/twisted/avahi/tubes/two-muc-dbus-tubes.py | 4 | ||||
| -rw-r--r-- | tests/twisted/avahi/tubes/two-muc-stream-tubes.py | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/tests/twisted/avahi/tubes/request-muc-tubes.py b/tests/twisted/avahi/tubes/request-muc-tubes.py index b57ae98e..21100f15 100644 --- a/tests/twisted/avahi/tubes/request-muc-tubes.py +++ b/tests/twisted/avahi/tubes/request-muc-tubes.py @@ -39,30 +39,28 @@ def test(q, bus, conn): cs.STREAM_TUBE_SERVICE: 'loldongs', }) - ret, old_sig, new_sig = q.expect_many( + ret, new_sig = q.expect_many( EventPattern('dbus-return', method='CreateChannel'), - EventPattern('dbus-signal', signal='NewChannel'), EventPattern('dbus-signal', signal='NewChannels'), ) tube_path = ret.value[0] chan = wrap_channel(bus.get_object(conn.bus_name, tube_path), 'StreamTube') - handle = conn.RequestHandles(cs.HT_ROOM, ['my-second-room'])[0] - tube_props = ret.value[1] assert tube_props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_STREAM_TUBE assert tube_props[cs.TARGET_HANDLE_TYPE] == cs.HT_ROOM - assert tube_props[cs.TARGET_HANDLE] == handle assert tube_props[cs.TARGET_ID] == 'my-second-room' assert tube_props[cs.REQUESTED] == True - assert tube_props[cs.INITIATOR_HANDLE] == conn.GetSelfHandle() + assert tube_props[cs.INITIATOR_HANDLE] == conn.Properties.Get(cs.CONN, "SelfHandle") assert tube_props[cs.INITIATOR_ID] == self_name # text and tube channels are announced channels = new_sig.args[0] assert len(channels) == 1 + handle = tube_props[cs.TARGET_HANDLE] + path, props = channels[0] assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_STREAM_TUBE assert path == tube_path @@ -70,7 +68,7 @@ def test(q, bus, conn): assert props[cs.TARGET_HANDLE_TYPE] == cs.HT_ROOM assert props[cs.TARGET_HANDLE] == handle assert props[cs.TARGET_ID] == 'my-second-room' - assert props[cs.INITIATOR_HANDLE] == conn.GetSelfHandle() + assert props[cs.INITIATOR_HANDLE] == conn.Properties.Get(cs.CONN, "SelfHandle") assert props[cs.INITIATOR_ID] == self_name # ensure the same channel diff --git a/tests/twisted/avahi/tubes/tubetestutil.py b/tests/twisted/avahi/tubes/tubetestutil.py index bec6ad48..d058ef62 100644 --- a/tests/twisted/avahi/tubes/tubetestutil.py +++ b/tests/twisted/avahi/tubes/tubetestutil.py @@ -79,7 +79,7 @@ def connect_two_accounts(q, bus, conn): return contact1_name, conn2, contact2_name, contact2_handle_on_conn1, contact1_handle_on_conn2 def join_muc(q, conn, muc_name): - self_handle = conn.GetSelfHandle() + self_handle = conn.Properties.Get(cs.CONN, "SelfHandle") muc_handle = conn.RequestHandles(cs.HT_ROOM, [muc_name])[0] path = conn.RequestChannel(cs.CHANNEL_TYPE_TEXT, cs.HT_ROOM, muc_handle, True) # added as remote pending @@ -103,7 +103,7 @@ def invite_to_muc(q, group1, conn2, invited_handle, inviter_handle): # we are invited to the muc # added as local pending - conn2_self_handle = conn2.GetSelfHandle() + conn2_self_handle = conn2.Properties.Get(cs.CONN, "SelfHandle") q.expect('dbus-signal', signal='MembersChanged', path=path, args=["Let's tube!", [], [], [conn2_self_handle], [], inviter_handle, 4]) diff --git a/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py b/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py index 3d33a5bb..6fc81097 100644 --- a/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py +++ b/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py @@ -49,8 +49,8 @@ def test(q, bus, conn): contact1_name, conn2, contact2_name, contact2_handle_on_conn1,\ contact1_handle_on_conn2 = t.connect_two_accounts(q, bus, conn) - conn1_self_handle = conn.GetSelfHandle() - conn2_self_handle = conn2.GetSelfHandle() + conn1_self_handle = conn.Properties.Get(cs.CONN, "SelfHandle") + conn2_self_handle = conn2.Properties.Get(cs.CONN, "SelfHandle") # first connection: join muc muc_handle1, group1 = t.join_muc(q, conn, muc_name) diff --git a/tests/twisted/avahi/tubes/two-muc-stream-tubes.py b/tests/twisted/avahi/tubes/two-muc-stream-tubes.py index 2e3bae53..a193bea2 100644 --- a/tests/twisted/avahi/tubes/two-muc-stream-tubes.py +++ b/tests/twisted/avahi/tubes/two-muc-stream-tubes.py @@ -76,7 +76,7 @@ def test(q, bus, conn): contact1_name, conn2, contact2_name, contact2_handle_on_conn1,\ contact1_handle_on_conn2 = t.connect_two_accounts(q, bus, conn) - conn1_self_handle = conn.GetSelfHandle() + conn1_self_handle = conn.Properties.Get(cs.CONN, "SelfHandle") # request a stream tube channel (new API) conn.Requests.CreateChannel({ |