summaryrefslogtreecommitdiff
path: root/tests/twisted/tubes/accept-private-dbus-tube.py
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-01-21 13:13:54 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-01-29 14:28:06 +0100
commitc252ced5cf209e869fb75dabae61f18e0db0850d (patch)
treec728351b5f94fbada34078ba106b2e3a521f3894 /tests/twisted/tubes/accept-private-dbus-tube.py
parent13689ba8c361ecff7eac270b6642f1f52613800a (diff)
update for new spec
- NewChannels -> NewChannel - RequestableChannelClasses is now in Connection - Call. add InitialTones property
Diffstat (limited to 'tests/twisted/tubes/accept-private-dbus-tube.py')
-rw-r--r--tests/twisted/tubes/accept-private-dbus-tube.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/twisted/tubes/accept-private-dbus-tube.py b/tests/twisted/tubes/accept-private-dbus-tube.py
index fb81cb63e..7f3efab71 100644
--- a/tests/twisted/tubes/accept-private-dbus-tube.py
+++ b/tests/twisted/tubes/accept-private-dbus-tube.py
@@ -91,14 +91,12 @@ def test(q, bus, conn, stream, bytestream_cls, access_control):
contact_offer_dbus_tube(bytestream, last_tube_id)
def new_chan_predicate(e):
- path, props = e.args[0][0]
+ path, props = e.args
return props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_DBUS_TUBE
- e = q.expect('dbus-signal', signal='NewChannels',
+ e = q.expect('dbus-signal', signal='NewChannel',
predicate=new_chan_predicate)
- channels = e.args[0]
- assert len(channels) == 1
- path, props = channels[0]
+ path, props = e.args
assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_DBUS_TUBE
assert props[cs.INITIATOR_HANDLE] == bob_handle