telepathy-idle: stop testing NewChannel signal

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Mon Sep 23 04:53:09 PDT 2013


Module: telepathy-idle
Branch: master
Commit: d759efc913a52a0546dbf53d2e5757043eb9b54b
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=d759efc913a52a0546dbf53d2e5757043eb9b54b

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Sep 20 15:03:41 2013 +0200

stop testing NewChannel signal

It will be removed in Telepathy 1.0

---

 tests/twisted/channels/join-muc-channel-bouncer.py |    8 +-------
 tests/twisted/channels/requests-create.py          |    9 +--------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/tests/twisted/channels/join-muc-channel-bouncer.py b/tests/twisted/channels/join-muc-channel-bouncer.py
index 8389c84..99be149 100644
--- a/tests/twisted/channels/join-muc-channel-bouncer.py
+++ b/tests/twisted/channels/join-muc-channel-bouncer.py
@@ -21,15 +21,9 @@ def test_join_bouncer(q, conn, stream, room):
     assertEquals(HT_ROOM, props[TARGET_HANDLE_TYPE])
     assertEquals(CHANNEL_TYPE_TEXT, props[CHANNEL_TYPE])
 
-    new_channel = EventPattern('dbus-signal', signal='NewChannel')
-    event = q.expect_many(new_channel)[0]
-    q.forbid_events([new_channel])
-    assertEquals(CHANNEL_TYPE_TEXT, event.args[1])
-    assertEquals(HT_ROOM, event.args[2])
-
     q.expect('dbus-signal', signal='MembersChanged')
 
-    q.unforbid_events([new_channels, new_channel])
+    q.unforbid_events([new_channels])
     return path
 
 def test(q, bus, conn, stream):
diff --git a/tests/twisted/channels/requests-create.py b/tests/twisted/channels/requests-create.py
index e60e86b..54f5eb3 100644
--- a/tests/twisted/channels/requests-create.py
+++ b/tests/twisted/channels/requests-create.py
@@ -41,9 +41,8 @@ def test(q, bus, conn, stream):
               }
     call_async(q, requestotron, 'CreateChannel', request)
 
-    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'),
         )
 
@@ -57,12 +56,6 @@ def test(q, bus, conn, stream):
     assert emitted_props[cs.INITIATOR_HANDLE] == conn.GetSelfHandle()
     assert emitted_props[cs.INITIATOR_ID] == stream.nick
 
-    assert old_sig.args[0] == ret.value[0]
-    assert old_sig.args[1] == cs.CHANNEL_TYPE_TEXT
-    assert old_sig.args[2] == cs.HT_CONTACT
-    assert old_sig.args[3] == foo_handle
-    assert old_sig.args[4] == True      # suppress handler
-
     assert len(new_sig.args) == 1
     assert len(new_sig.args[0]) == 1        # one channel
     assert len(new_sig.args[0][0]) == 2     # two struct members



More information about the telepathy-commits mailing list