summaryrefslogtreecommitdiff
path: root/tests/twisted/roster
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-10-26 16:19:58 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-10-26 16:21:45 +0200
commitd92500bcd3911dbddad5fff2d40cfbc674663b41 (patch)
treed105a2149bde014c847bbb172555afa1ca46d8df /tests/twisted/roster
parenta8f305d39ee09748ac258ce577dd9738278f9561 (diff)
actually implement ContactBlocking interface
https://bugs.freedesktop.org/show_bug.cgi?id=42281
Diffstat (limited to 'tests/twisted/roster')
-rw-r--r--tests/twisted/roster/test-google-roster.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/twisted/roster/test-google-roster.py b/tests/twisted/roster/test-google-roster.py
index d6c559898..5e52751a3 100644
--- a/tests/twisted/roster/test-google-roster.py
+++ b/tests/twisted/roster/test-google-roster.py
@@ -295,9 +295,6 @@ def test_deny_simple(q, bus, conn, stream, stored, deny):
EventPattern('dbus-return', method='RemoveMembers'),
)
- assertContains(cs.CONN_IFACE_CONTACT_BLOCKING,
- conn.Properties.Get(cs.CONN, "Interfaces"))
-
# Our server sends roster pushes in response to our unsubscribe and
# unsubscribed commands.
stream.send(make_set_roster_iq(stream, 'test@localhost/Resource', contact,
@@ -518,6 +515,15 @@ def test_deny_unblock_remove(q, bus, conn, stream, stored, deny):
args=['', [], [handle], [], [], 0, cs.GC_REASON_NONE],
predicate=is_stored)
+def test_contact_blocking(q, bus, conn, stream, stored, deny):
+ """test ContactBlocking API"""
+ assertContains(cs.CONN_IFACE_CONTACT_BLOCKING,
+ conn.Properties.Get(cs.CONN, "Interfaces"))
+
+ # 3 contacts are blocked
+ blocked = conn.RequestBlockedContacts(dbus_interface=cs.CONN_IFACE_CONTACT_BLOCKING)
+
+ assertLength(3, blocked)
def test(q, bus, conn, stream):
publish, subscribe, stored, deny = test_inital_roster(q, bus, conn, stream)
@@ -528,6 +534,7 @@ def test(q, bus, conn, stream):
test_deny_overlap_two(q, bus, conn, stream,
subscribe, publish, stored, deny)
test_deny_unblock_remove(q, bus, conn, stream, stored, deny)
+ test_contact_blocking(q, bus, conn, stream, stored, deny)
if __name__ == '__main__':
exec_test(test, protocol=GoogleXmlStream)