update for new spec

- NewChannels -> NewChannel
- RequestableChannelClasses is now in Connection
- Call. add InitialTones property

8 files changed, 47 insertions, 59 deletions

diff --git a/tests/twisted/sasl/saslutil.py b/tests/twisted/sasl/saslutil.py
index 83afe2b..2912f95 100644
--- a/tests/twisted/sasl/saslutil.py
+++ b/tests/twisted/sasl/saslutil.py
@@ -89,17 +89,15 @@ def connect_and_get_sasl_channel(q, bus, conn):
     return expect_sasl_channel(q, bus, conn)
 
 def expect_sasl_channel(q, bus, conn):
-    signal, = q.expect_many(
-            EventPattern('dbus-signal', signal='NewChannels',
-                predicate=lambda e:
-                    e.args[0][0][1].get(cs.CHANNEL_TYPE) ==
-                        cs.CHANNEL_TYPE_SERVER_AUTHENTICATION),
-                )
-    path = signal.args[0][0][0]
+    signal = q.expect('dbus-signal', signal='NewChannel',
+            predicate=lambda e:
+                    e.args[1].get(cs.CHANNEL_TYPE) ==
+                        cs.CHANNEL_TYPE_SERVER_AUTHENTICATION)
+
+    path = signal.args[0]
 
     chan = SaslChannelWrapper(bus.get_object(conn.bus_name, path))
-    assertLength(1, signal.args[0])
-    props = signal.args[0][0][1]
+    props = signal.args[1]
 
     assertEquals(cs.CHANNEL_IFACE_SASL_AUTH, props.get(cs.AUTH_METHOD))
     return chan, props
diff --git a/tests/twisted/text/destroy.py b/tests/twisted/text/destroy.py
index c6edcff..c7d2350 100644
--- a/tests/twisted/text/destroy.py
+++ b/tests/twisted/text/destroy.py
@@ -25,7 +25,7 @@ def test(q, bus, conn, stream):
 
     ret, sig = q.expect_many(
         EventPattern('dbus-return', method='CreateChannel'),
-        EventPattern('dbus-signal', signal='NewChannels'),
+        EventPattern('dbus-signal', signal='NewChannel'),
         )
 
     text_chan = bus.get_object(conn.bus_name, ret.value[0])
@@ -33,11 +33,8 @@ def test(q, bus, conn, stream):
     text_iface = dbus.Interface(text_chan, cs.CHANNEL_TYPE_TEXT)
     destroyable_iface = dbus.Interface(text_chan, cs.CHANNEL_IFACE_DESTROYABLE)
 
-    assertLength(1, sig.args)
-    assertLength(1, sig.args[0])        # one channel
-    assertLength(2, sig.args[0][0])     # two struct members
-    assertEquals(ret.value, sig.args[0][0])
-    emitted_props = sig.args[0][0][1]
+    assertEquals(ret.value, (sig.args[0], sig.args[1]))
+    emitted_props = sig.args[1]
     assertEquals(cs.CHANNEL_TYPE_TEXT, emitted_props[cs.CHANNEL_TYPE])
     assertEquals(cs.HT_CONTACT, emitted_props[cs.TARGET_HANDLE_TYPE])
     assertEquals(foo_handle, emitted_props[cs.TARGET_HANDLE])
diff --git a/tests/twisted/text/ensure.py b/tests/twisted/text/ensure.py
index 6896408..58521f0 100644
--- a/tests/twisted/text/ensure.py
+++ b/tests/twisted/text/ensure.py
@@ -28,6 +28,8 @@ def test(q, bus, conn, stream):
                 if c[1][cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_TEXT
                ]
     assert text_channels == [], text_channels
+
+    properties = conn.GetAll(cs.CONN, dbus_interface=dbus.PROPERTIES_IFACE)
     assert ({cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_TEXT,
              cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
              },
@@ -53,7 +55,7 @@ def test_ensure_ensure(q, conn, self_handle, jid, handle):
 
     ret, sig = q.expect_many(
         EventPattern('dbus-return', method='EnsureChannel'),
-        EventPattern('dbus-signal', signal='NewChannels'),
+        EventPattern('dbus-signal', signal='NewChannel'),
         )
 
     assert len(ret.value) == 3
@@ -65,16 +67,13 @@ def test_ensure_ensure(q, conn, self_handle, jid, handle):
 
     check_props(emitted_props, self_handle, handle, jid)
 
-    assertLength(1, sig.args)
-    assertLength(1, sig.args[0])        # one channel
-    assertLength(2, sig.args[0][0])     # two struct members
-    assertEquals(path, sig.args[0][0][0])
-    assertEquals(emitted_props, sig.args[0][0][1])
+    assertEquals(path, sig.args[0])
+    assertEquals(emitted_props, sig.args[1])
 
     properties = conn.GetAll(cs.CONN_IFACE_REQUESTS,
             dbus_interface=dbus.PROPERTIES_IFACE)
 
-    assertContains(sig.args[0][0], properties['Channels'])
+    assertContains((sig.args[0], sig.args[1]), properties['Channels'])
 
     # Now try Ensuring a channel which already exists
     call_async(q, conn.Requests, 'EnsureChannel', request_props (handle))
@@ -100,7 +99,7 @@ def test_request_ensure(q, conn, self_handle, jid, handle):
 
     ret, sig = q.expect_many(
         EventPattern('dbus-return', method='CreateChannel'),
-        EventPattern('dbus-signal', signal='NewChannels'),
+        EventPattern('dbus-signal', signal='NewChannel'),
         )
 
     assert len(ret.value) == 2
@@ -108,16 +107,13 @@ def test_request_ensure(q, conn, self_handle, jid, handle):
 
     check_props(emitted_props, self_handle, handle, jid)
 
-    assertLength(1, sig.args)
-    assertLength(1, sig.args[0])        # one channel
-    assertLength(2, sig.args[0][0])     # two struct members
-    assertEquals(path, sig.args[0][0][0])
-    assertEquals(emitted_props, sig.args[0][0][1])
+    assertEquals(path, sig.args[0])
+    assertEquals(emitted_props, sig.args[1])
 
     properties = conn.GetAll(cs.CONN_IFACE_REQUESTS,
             dbus_interface=dbus.PROPERTIES_IFACE)
 
-    assertContains(sig.args[0][0], properties['Channels'])
+    assertContains((sig.args[0], sig.args[1]), properties['Channels'])
 
     # Now try Ensuring that same channel.
     call_async(q, conn.Requests, 'EnsureChannel', request_props (handle))
diff --git a/tests/twisted/text/initiate-requestotron.py b/tests/twisted/text/initiate-requestotron.py
index c76dd36..2120436 100644
--- a/tests/twisted/text/initiate-requestotron.py
+++ b/tests/twisted/text/initiate-requestotron.py
@@ -28,6 +28,9 @@ def test(q, bus, conn, stream):
                 if c[1][cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_TEXT
                ]
     assert text_channels == [], text_channels
+
+    properties = conn.GetAll(cs.CONN,
+            dbus_interface=dbus.PROPERTIES_IFACE)
     assert ({cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_TEXT,
              cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
              },
@@ -43,7 +46,7 @@ def test(q, bus, conn, stream):
 
     ret, sig = q.expect_many(
         EventPattern('dbus-return', method='CreateChannel'),
-        EventPattern('dbus-signal', signal='NewChannels'),
+        EventPattern('dbus-signal', signal='NewChannel'),
         )
 
     assert len(ret.value) == 2
@@ -56,16 +59,13 @@ def test(q, bus, conn, stream):
     assertEquals(self_handle, emitted_props[cs.INITIATOR_HANDLE])
     assertEquals('test@localhost', emitted_props[cs.INITIATOR_ID])
 
-    assertLength(1, sig.args)
-    assertLength(1, sig.args[0])        # one channel
-    assertLength(2, sig.args[0][0])     # two struct members
-    assertEquals(ret.value[0], sig.args[0][0][0])
-    assertEquals(ret.value[1], sig.args[0][0][1])
+    assertEquals(ret.value[0], sig.args[0])
+    assertEquals(ret.value[1], sig.args[1])
 
     properties = conn.GetAll(cs.CONN_IFACE_REQUESTS,
             dbus_interface=dbus.PROPERTIES_IFACE)
 
-    assertContains(sig.args[0][0], properties['Channels'])
+    assertContains((sig.args[0], sig.args[1]), properties['Channels'])
 
     conn.Disconnect()
     q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
diff --git a/tests/twisted/text/respawn.py b/tests/twisted/text/respawn.py
index cdc9105..e3dbb9c 100644
--- a/tests/twisted/text/respawn.py
+++ b/tests/twisted/text/respawn.py
@@ -24,18 +24,15 @@ def test(q, bus, conn, stream):
 
     ret, sig = q.expect_many(
         EventPattern('dbus-return', method='CreateChannel'),
-        EventPattern('dbus-signal', signal='NewChannels'),
+        EventPattern('dbus-signal', signal='NewChannel'),
         )
 
     text_chan = bus.get_object(conn.bus_name, ret.value[0])
     chan_iface = dbus.Interface(text_chan, cs.CHANNEL)
     text_iface = dbus.Interface(text_chan, cs.CHANNEL_TYPE_TEXT)
 
-    assertLength(1, sig.args)
-    assertLength(1, sig.args[0])        # one channel
-    assertLength(2, sig.args[0][0])     # two struct members
-    assertEquals(ret.value, sig.args[0][0])
-    emitted_props = sig.args[0][0][1]
+    assertEquals(ret.value, ( sig.args[0], sig.args[1] ))
+    emitted_props = sig.args[1]
     assertEquals(cs.CHANNEL_TYPE_TEXT, emitted_props[cs.CHANNEL_TYPE])
     assertEquals(cs.HT_CONTACT, emitted_props[cs.TARGET_HANDLE_TYPE])
     assertEquals(foo_handle, emitted_props[cs.TARGET_HANDLE])
@@ -115,9 +112,9 @@ def test(q, bus, conn, stream):
     new_props[cs.INITIATOR_ID] = 'foo@bar.com'
     new_props[cs.REQUESTED] = False
 
-    event = q.expect('dbus-signal', signal='NewChannels')
-    assertEquals(text_chan.object_path, event.args[0][0][0])
-    assertEquals(new_props, event.args[0][0][1])
+    event = q.expect('dbus-signal', signal='NewChannel')
+    assertEquals(text_chan.object_path, event.args[0])
+    assertEquals(new_props, event.args[1])
 
     event = q.expect('dbus-return', method='Close')
 
diff --git a/tests/twisted/text/test-text-delayed.py b/tests/twisted/text/test-text-delayed.py
index 59e73d0..bb9695e 100644
--- a/tests/twisted/text/test-text-delayed.py
+++ b/tests/twisted/text/test-text-delayed.py
@@ -23,10 +23,10 @@ def test(q, bus, conn, stream):
 
     stream.send(m)
 
-    event = q.expect('dbus-signal', signal='NewChannels')
-    assertEquals(cs.CHANNEL_TYPE_TEXT, event.args[0][0][1][cs.CHANNEL_TYPE])
-    assertEquals(cs.HT_CONTACT, event.args[0][0][1][cs.TARGET_HANDLE_TYPE])
-    assertEquals('foo@bar.com', event.args[0][0][1][cs.TARGET_ID])
+    event = q.expect('dbus-signal', signal='NewChannel')
+    assertEquals(cs.CHANNEL_TYPE_TEXT, event.args[1][cs.CHANNEL_TYPE])
+    assertEquals(cs.HT_CONTACT, event.args[1][cs.TARGET_HANDLE_TYPE])
+    assertEquals('foo@bar.com', event.args[1][cs.TARGET_ID])
 
     message_received = q.expect('dbus-signal', signal='MessageReceived')
 
diff --git a/tests/twisted/text/test-text-no-body.py b/tests/twisted/text/test-text-no-body.py
index c8aacd7..c5e32cc 100644
--- a/tests/twisted/text/test-text-no-body.py
+++ b/tests/twisted/text/test-text-no-body.py
@@ -29,10 +29,10 @@ def test(q, bus, conn, stream):
     stream.send(m)
 
     # first message should be from Bob, not Alice
-    event = q.expect('dbus-signal', signal='NewChannels')
-    assertEquals(cs.CHANNEL_TYPE_TEXT, event.args[0][0][1][cs.CHANNEL_TYPE])
-    assertEquals(cs.HT_CONTACT, event.args[0][0][1][cs.TARGET_HANDLE_TYPE])
-    assertEquals('bob@foo.com', event.args[0][0][1][cs.TARGET_ID])
+    event = q.expect('dbus-signal', signal='NewChannel')
+    assertEquals(cs.CHANNEL_TYPE_TEXT, event.args[1][cs.CHANNEL_TYPE])
+    assertEquals(cs.HT_CONTACT, event.args[1][cs.TARGET_HANDLE_TYPE])
+    assertEquals('bob@foo.com', event.args[1][cs.TARGET_ID])
 
     conn.Disconnect()
     q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
diff --git a/tests/twisted/text/test-text.py b/tests/twisted/text/test-text.py
index 0a33755..ba2f7d4 100644
--- a/tests/twisted/text/test-text.py
+++ b/tests/twisted/text/test-text.py
@@ -21,13 +21,13 @@ def test(q, bus, conn, stream):
     m.addElement('body', content='hello')
     stream.send(m)
 
-    event = q.expect('dbus-signal', signal='NewChannels')
-    assertEquals(cs.CHANNEL_TYPE_TEXT, event.args[0][0][1][cs.CHANNEL_TYPE])
-    assertEquals(cs.HT_CONTACT, event.args[0][0][1][cs.TARGET_HANDLE_TYPE])
-    assertEquals(jid, event.args[0][0][1][cs.TARGET_ID])
-    foo_at_bar_dot_com_handle = event.args[0][0][1][cs.TARGET_HANDLE]
+    event = q.expect('dbus-signal', signal='NewChannel')
+    assertEquals(cs.CHANNEL_TYPE_TEXT, event.args[1][cs.CHANNEL_TYPE])
+    assertEquals(cs.HT_CONTACT, event.args[1][cs.TARGET_HANDLE_TYPE])
+    assertEquals(jid, event.args[1][cs.TARGET_ID])
+    foo_at_bar_dot_com_handle = event.args[1][cs.TARGET_HANDLE]
 
-    text_chan = bus.get_object(conn.bus_name, event.args[0][0][0])
+    text_chan = bus.get_object(conn.bus_name, event.args[0])
 
     # Exercise basic Channel Properties from spec 0.17.7
     channel_props = text_chan.GetAll(cs.CHANNEL,