summaryrefslogtreecommitdiff
path: root/tests/twisted/avahi/tubes/request-muc-tubes.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/twisted/avahi/tubes/request-muc-tubes.py')
-rw-r--r--tests/twisted/avahi/tubes/request-muc-tubes.py30
1 files changed, 11 insertions, 19 deletions
diff --git a/tests/twisted/avahi/tubes/request-muc-tubes.py b/tests/twisted/avahi/tubes/request-muc-tubes.py
index ce54ab35..72ecbb19 100644
--- a/tests/twisted/avahi/tubes/request-muc-tubes.py
+++ b/tests/twisted/avahi/tubes/request-muc-tubes.py
@@ -61,25 +61,17 @@ def test(q, bus, conn):
# text and tube channels are announced
channels = new_sig.args[0]
- assert len(channels) == 2
- got_text, got_tube = False, False
-
- for path, props in channels:
- if props[CHANNEL_TYPE] == CHANNEL_TYPE_TEXT:
- got_text = True
- assert props[REQUESTED] == False
- elif props[CHANNEL_TYPE] == CHANNEL_TYPE_STREAM_TUBE:
- got_tube = True
- assert path == tube_path
- assert props == tube_props
- else:
- assert False
-
- assert props[TARGET_HANDLE_TYPE] == HT_ROOM
- assert props[TARGET_HANDLE] == handle
- assert props[TARGET_ID] == 'my-second-room'
- assert props[INITIATOR_HANDLE] == conn.GetSelfHandle()
- assert props[INITIATOR_ID] == self_name
+ assert len(channels) == 1
+
+ path, props = channels[0]
+ assert props[CHANNEL_TYPE] == CHANNEL_TYPE_STREAM_TUBE
+ assert path == tube_path
+ assert props == tube_props
+ assert props[TARGET_HANDLE_TYPE] == HT_ROOM
+ assert props[TARGET_HANDLE] == handle
+ assert props[TARGET_ID] == 'my-second-room'
+ assert props[INITIATOR_HANDLE] == conn.GetSelfHandle()
+ assert props[INITIATOR_ID] == self_name
# ensure the same channel
# yours, ensured_path, ensured_props = conn.Requests.EnsureChannel(