summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-09-20 15:03:41 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-09-23 13:01:39 +0200
commitd759efc913a52a0546dbf53d2e5757043eb9b54b (patch)
tree5fc6a5413febb87b53e20e30c4fb65e8275a2ebf
parent017669901bbe009a4c55892a8d0fb4a100740de4 (diff)
stop testing NewChannel signal
It will be removed in Telepathy 1.0
-rw-r--r--tests/twisted/channels/join-muc-channel-bouncer.py8
-rw-r--r--tests/twisted/channels/requests-create.py9
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