telepathy-gabble: use MembersChangedDetailed instead of MembersChanged
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Fri Oct 11 14:58:34 PDT 2013
Module: telepathy-gabble
Branch: master
Commit: a353f807b118fd205f5a72dc317026954a038f96
URL: http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=a353f807b118fd205f5a72dc317026954a038f96
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Wed Oct 9 18:55:50 2013 -0400
use MembersChangedDetailed instead of MembersChanged
---
tests/twisted/muc/test-ensure.py | 16 ++++++++--------
tests/twisted/muc/test-muc-invitation.py | 19 ++++++++++++++-----
tests/twisted/muc/test-muc-ownership.py | 8 ++++----
tests/twisted/roster/test-roster-subscribe.py | 19 +++++++++++--------
tests/twisted/roster/test-save-alias-to-roster.py | 2 +-
5 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/tests/twisted/muc/test-ensure.py b/tests/twisted/muc/test-ensure.py
index f015051..8583852 100644
--- a/tests/twisted/muc/test-ensure.py
+++ b/tests/twisted/muc/test-ensure.py
@@ -30,9 +30,9 @@ def test_create_ensure(q, conn, bus, stream, room_jid):
})
mc, _ = q.expect_many(
- EventPattern('dbus-signal', signal='MembersChanged'),
+ EventPattern('dbus-signal', signal='MembersChangedDetailed'),
EventPattern('stream-presence', to=('%s/test' % room_jid)))
- msg, added, removed, local_pending, remote_pending, actor, reason = mc.args
+ added, removed, local_pending, remote_pending, details = mc.args
assert added == [], mc.args
assert removed == [], mc.args
@@ -45,8 +45,8 @@ def test_create_ensure(q, conn, bus, stream, room_jid):
# Send presence for own membership of room.
stream.send(make_muc_presence('none', 'participant', room_jid, 'test'))
- mc = q.expect('dbus-signal', signal='MembersChanged')
- msg, added, removed, local_pending, remote_pending, actor, reason = mc.args
+ mc = q.expect('dbus-signal', signal='MembersChangedDetailed')
+ added, removed, local_pending, remote_pending, details = mc.args
assert len(added) == 2, mc.args
assert removed == [], mc.args
@@ -94,9 +94,9 @@ def test_ensure_ensure(q, conn, bus, stream, room_jid):
})
mc, _ = q.expect_many(
- EventPattern('dbus-signal', signal='MembersChanged'),
+ EventPattern('dbus-signal', signal='MembersChangedDetailed'),
EventPattern('stream-presence', to=('%s/test' % room_jid)))
- msg, added, removed, local_pending, remote_pending, actor, reason = mc.args
+ added, removed, local_pending, remote_pending, details = mc.args
assert added == [], mc.args
assert removed == [], mc.args
@@ -109,8 +109,8 @@ def test_ensure_ensure(q, conn, bus, stream, room_jid):
# Send presence for own membership of room.
stream.send(make_muc_presence('none', 'participant', room_jid, 'test'))
- mc = q.expect('dbus-signal', signal='MembersChanged')
- msg, added, removed, local_pending, remote_pending, actor, reason = mc.args
+ mc = q.expect('dbus-signal', signal='MembersChangedDetailed')
+ added, removed, local_pending, remote_pending, details = mc.args
assert len(added) == 2, mc.args
assert removed == [], mc.args
diff --git a/tests/twisted/muc/test-muc-invitation.py b/tests/twisted/muc/test-muc-invitation.py
index 1d5a339..ea7419a 100644
--- a/tests/twisted/muc/test-muc-invitation.py
+++ b/tests/twisted/muc/test-muc-invitation.py
@@ -62,7 +62,7 @@ def test(q, bus, conn, stream):
event, event2, _ = q.expect_many(
EventPattern('stream-presence', to='chat at conf.localhost/test'),
- EventPattern('dbus-signal', signal='MembersChanged'),
+ EventPattern('dbus-signal', signal='MembersChangedDetailed'),
EventPattern('dbus-return', method='AddMembers')
)
@@ -77,8 +77,12 @@ def test(q, bus, conn, stream):
# We are added as remote pending while joining the room. The inviter (Bob)
# is removed for now. It will be re-added with his channel specific handle
# once we have joined.
- assert event2.args == ['', [], [bob_handle], [],
- [room_self_handle], 0, cs.GC_REASON_INVITED]
+ added, removed, local_pending, remote_pending, details = event2.args
+ assertEquals([], added)
+ assertEquals([bob_handle], removed)
+ assertEquals([], local_pending)
+ assertEquals([room_self_handle], remote_pending)
+ assertEquals(cs.GC_REASON_INVITED, details['change-reason'])
# Send presence for Bob's membership of room.
stream.send(make_muc_presence('owner', 'moderator', 'chat at conf.localhost', 'bob'))
@@ -86,10 +90,15 @@ def test(q, bus, conn, stream):
# Send presence for own membership of room.
stream.send(make_muc_presence('owner', 'moderator', 'chat at conf.localhost', 'test'))
- event = q.expect('dbus-signal', signal='MembersChanged')
+ event = q.expect('dbus-signal', signal='MembersChangedDetailed')
room_bob_handle = conn.get_contact_handle_sync('chat at conf.localhost/bob')
- assert event.args == ['', [room_self_handle, room_bob_handle], [], [], [], 0, 0]
+
+ added, removed, local_pending, remote_pending, details = event.args
+ assertEquals([room_self_handle, room_bob_handle], added)
+ assertEquals([], removed)
+ assertEquals([], local_pending)
+ assertEquals([], remote_pending)
# Test sending an invitation
alice_handle = conn.get_contact_handle_sync('alice at localhost')
diff --git a/tests/twisted/muc/test-muc-ownership.py b/tests/twisted/muc/test-muc-ownership.py
index 2b6af8d..d5d97b9 100644
--- a/tests/twisted/muc/test-muc-ownership.py
+++ b/tests/twisted/muc/test-muc-ownership.py
@@ -27,8 +27,8 @@ def test(q, bus, conn, stream):
# Initial group flags
EventPattern('dbus-signal', signal='GroupFlagsChanged',
predicate=lambda e: e.args[0] != 0),
- EventPattern('dbus-signal', signal='MembersChanged',
- args=[u'', [], [], [], [2], 0, 0]),
+ EventPattern('dbus-signal', signal='MembersChangedDetailed',
+ predicate=lambda e: e.args[3] == [2]),
# Removing CAN_ADD
EventPattern('dbus-signal', signal='GroupFlagsChanged',
args = [0, cs.GF_CAN_ADD], predicate=lambda e: e.args[0] == 0),
@@ -60,8 +60,8 @@ def test(q, bus, conn, stream):
event = q.expect('dbus-signal', signal='HandleOwnersChanged')
owners = event.args[0]
- event = q.expect('dbus-signal', signal='MembersChanged')
- added = event.args[1]
+ event = q.expect('dbus-signal', signal='MembersChangedDetailed')
+ added = event.args[0]
[test, bob, brian, che, che_owner, chris, chris_owner] = \
conn.get_contact_handles_sync(
diff --git a/tests/twisted/roster/test-roster-subscribe.py b/tests/twisted/roster/test-roster-subscribe.py
index f7bff8c..43eb2dd 100644
--- a/tests/twisted/roster/test-roster-subscribe.py
+++ b/tests/twisted/roster/test-roster-subscribe.py
@@ -82,9 +82,10 @@ def test(q, bus, conn, stream, remove=False, remote='accept'):
stream.send(presence)
q.expect_many(
- EventPattern('dbus-signal', signal='MembersChanged',
- args=['', [], [bob], [], [], bob,
- cs.GC_REASON_PERMISSION_DENIED]),
+ EventPattern('dbus-signal', signal='MembersChangedDetailed',
+ predicate=lambda e: e.args[0] == [] and e.args[1] == [bob] and
+ e.args[2] == [] and e.args[3] == [] and
+ e.args[4]['change-reason'] == cs.GC_REASON_PERMISSION_DENIED),
#EventPattern('stream-presence'),
EventPattern('dbus-signal', signal='ContactsChangedWithID',
args=[{bob:
@@ -103,8 +104,9 @@ def test(q, bus, conn, stream, remove=False, remote='accept'):
stream.send(presence)
q.expect_many(
- EventPattern('dbus-signal', signal='MembersChanged',
- args=['', [bob], [], [], [], bob, 0]),
+ EventPattern('dbus-signal', signal='MembersChangedDetailed',
+ predicate=lambda e: e.args[0] == [bob] and e.args[1] == [] and
+ e.args[2] == [] and e.args[3] == []),
EventPattern('stream-presence'),
EventPattern('dbus-signal', signal='ContactsChangedWithID',
args=[{bob:
@@ -143,9 +145,10 @@ def test(q, bus, conn, stream, remove=False, remote='accept'):
stream.send(presence)
q.expect_many(
- EventPattern('dbus-signal', signal='MembersChanged',
- args=['', [], [bob], [], [], bob,
- cs.GC_REASON_PERMISSION_DENIED]),
+ EventPattern('dbus-signal', signal='MembersChangedDetailed',
+ predicate=lambda e: e.args[0] == [] and e.args[1] == [bob] and
+ e.args[2] == [] and e.args[3] == [] and
+ e.args[4]['change-reason'] == cs.GC_REASON_PERMISSION_DENIED),
EventPattern('stream-presence'),
EventPattern('dbus-signal', signal='ContactsChangedWithID',
args=[{bob:
diff --git a/tests/twisted/roster/test-save-alias-to-roster.py b/tests/twisted/roster/test-save-alias-to-roster.py
index 25cdba8..f8c0c2a 100644
--- a/tests/twisted/roster/test-save-alias-to-roster.py
+++ b/tests/twisted/roster/test-save-alias-to-roster.py
@@ -88,7 +88,7 @@ def test(q, bus, conn, stream):
# I don't really have very strong opinions on whether Gabble should be
# signalling that this contact's alias has *changed* per se, so am not
# explicitly expecting that.
- q.expect('dbus-signal', signal='MembersChanged')
+ q.expect('dbus-signal', signal='MembersChangedDetailed')
# But if we ask for it, Gabble should probably send a PEP query.
assertEquals(jid, conn.Aliasing.GetAliases([handle])[handle])
More information about the telepathy-commits
mailing list