[telepathy-gabble/master] Refactor testing incoming tubes caps
Will Thompson
will.thompson at collabora.co.uk
Wed Jun 3 07:15:28 PDT 2009
---
tests/twisted/test-caps-tubes.py | 366 +++++++++-----------------------------
1 files changed, 83 insertions(+), 283 deletions(-)
diff --git a/tests/twisted/test-caps-tubes.py b/tests/twisted/test-caps-tubes.py
index 7583b39..63becd0 100644
--- a/tests/twisted/test-caps-tubes.py
+++ b/tests/twisted/test-caps-tubes.py
@@ -35,6 +35,7 @@ import dbus
from twisted.words.xish import xpath
+from servicetest import assertEquals, assertLength
from gabbletest import exec_test, make_result_iq, sync_stream, make_presence
import constants as cs
@@ -70,260 +71,101 @@ go_fixed_properties = dbus.Dictionary({
cs.DBUS_TUBE_SERVICE_NAME: 'com.example.Go'
})
-def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, client):
+client = 'http://telepathy.freedesktop.org/fake-client'
- conn_caps_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACT_CAPS)
- conn_contacts_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACTS)
-
- # send presence with no tube cap
+def receive_caps(q, conn, stream, contact, contact_handle, features,
+ expected_caps, expect_disco=True):
presence = make_presence(contact, status='hello')
c = presence.addElement((ns.CAPS, 'c'))
c['node'] = client
- c['ver'] = compute_caps_hash([], [], [])
+ c['ver'] = compute_caps_hash([],
+ features if features is not None else [],
+ [])
c['hash'] = 'sha-1'
stream.send(presence)
- # Gabble looks up our capabilities
- event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
- query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
- assert query_node.attributes['node'] == \
- client + '#' + c['ver']
+ if expect_disco:
+ # Gabble looks up our capabilities
+ event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
+ query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
+ assert query_node.attributes['node'] == \
+ client + '#' + c['ver']
- # send good reply
- result = make_result_iq(stream, event.stanza)
- query = result.firstChildElement()
- query['node'] = client + '#' + c['ver']
- stream.send(result)
+ # send good reply
+ result = make_result_iq(stream, event.stanza)
+ query = result.firstChildElement()
+ query['node'] = client + '#' + c['ver']
- # no change in ContactCapabilities, so no signal ContactCapabilitiesChanged
- sync_stream(q, stream)
+ for f in features:
+ feature = query.addElement('feature')
+ feature['var'] = f
+
+ stream.send(result)
+
+ event = q.expect('dbus-signal', signal='ContactCapabilitiesChanged')
+ announced_ccs, = event.args
+ assertEquals(expected_caps, announced_ccs)
+
+ caps = conn.ContactCapabilities.GetContactCapabilities([contact_handle])
+ assertEquals(expected_caps, caps)
- # no special capabilities
- basic_caps = dbus.Dictionary({contact_handle:
- [(text_fixed_properties, text_allowed_properties)]})
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == basic_caps, caps
# test again, to check GetContactCapabilities does not have side effect
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == basic_caps, caps
+ caps = conn.ContactCapabilities.GetContactCapabilities([contact_handle])
+ assertEquals(expected_caps, caps)
+
# check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
+ caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
[contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
[contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
- assert caps_via_contacts_iface == caps[contact_handle], \
- caps_via_contacts_iface
+ assertEquals(caps[contact_handle], caps_via_contacts_iface)
- # send presence with generic tubes caps
- presence = make_presence(contact, status='hello')
- c = presence.addElement((ns.CAPS, 'c'))
- c['node'] = client
- c['ver'] = compute_caps_hash([], [ns.TUBES], [])
- c['hash'] = 'sha-1'
- stream.send(presence)
+def test_tube_caps_from_contact(q, bus, conn, stream, contact):
+ contact_handle = conn.RequestHandles(cs.HT_CONTACT, [contact])[0]
+
+ # send presence with no tube cap
+ basic_caps = dbus.Dictionary({contact_handle:
+ [(text_fixed_properties, text_allowed_properties)]})
+ receive_caps(q, conn, stream, contact, contact_handle, [], basic_caps)
- # Gabble looks up our capabilities
- event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
- query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
- assert query_node.attributes['node'] == \
- client + '#' + c['ver']
-
- # send good reply
- result = make_result_iq(stream, event.stanza)
- query = result.firstChildElement()
- query['node'] = client + '#' + c['ver']
- feature = query.addElement('feature')
- feature['var'] = ns.TUBES
- stream.send(result)
-
- # generic tubes capabilities
+ # send presence with generic tubes caps
generic_tubes_caps = dbus.Dictionary({contact_handle:
[(text_fixed_properties, text_allowed_properties),
(stream_tube_fixed_properties, stream_tube_allowed_properties),
(dbus_tube_fixed_properties, dbus_tube_allowed_properties)]})
- event = q.expect('dbus-signal', signal='ContactCapabilitiesChanged')
- assert len(event.args) == 1
- assert event.args[0] == generic_tubes_caps
-
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == generic_tubes_caps, caps
- # test again, to check GetContactCapabilities does not have side effect
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == generic_tubes_caps, caps
- # check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
- assert caps_via_contacts_iface == caps[contact_handle], \
- caps_via_contacts_iface
-
+ receive_caps(q, conn, stream, contact, contact_handle, [ns.TUBES],
+ generic_tubes_caps)
# send presence with 1 stream tube cap
- presence = make_presence(contact, status='hello')
- c = presence.addElement((ns.CAPS, 'c'))
- c['node'] = client
- c['ver'] = compute_caps_hash([], [ns.TUBES + '/stream#daap'], [])
- c['hash'] = 'sha-1'
- stream.send(presence)
-
- # Gabble looks up our capabilities
- event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
- query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
- assert query_node.attributes['node'] == \
- client + '#' + c['ver']
-
- # send good reply
- result = make_result_iq(stream, event.stanza)
- query = result.firstChildElement()
- query['node'] = client + '#' + c['ver']
- feature = query.addElement('feature')
- feature['var'] = ns.TUBES + '/stream#daap'
- stream.send(result)
-
- # daap capabilities
daap_caps = dbus.Dictionary({contact_handle:
[(text_fixed_properties, text_allowed_properties),
(stream_tube_fixed_properties, stream_tube_allowed_properties),
(dbus_tube_fixed_properties, dbus_tube_allowed_properties),
(daap_fixed_properties, specialized_tube_allowed_properties)]})
- event = q.expect('dbus-signal', signal='ContactCapabilitiesChanged')
- assert len(event.args) == 1
- assert event.args[0] == daap_caps
-
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == daap_caps, caps
- # test again, to check GetContactCapabilities does not have side effect
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == daap_caps, caps
- # check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
- assert caps_via_contacts_iface == caps[contact_handle], \
- caps_via_contacts_iface
+ receive_caps(q, conn, stream, contact, contact_handle,
+ [ns.TUBES + '/stream#daap'], daap_caps)
# send presence with 1 D-Bus tube cap
- presence = make_presence(contact, status='hello')
- c = presence.addElement((ns.CAPS, 'c'))
- c['node'] = client
- c['ver'] = compute_caps_hash([], [ns.TUBES + '/dbus#com.example.Xiangqi'], [])
- c['hash'] = 'sha-1'
- stream.send(presence)
-
- # Gabble looks up our capabilities
- event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
- query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
- assert query_node.attributes['node'] == \
- client + '#' + c['ver']
-
- # send good reply
- result = make_result_iq(stream, event.stanza)
- query = result.firstChildElement()
- query['node'] = client + '#' + c['ver']
- feature = query.addElement('feature')
- feature['var'] = ns.TUBES + '/dbus#com.example.Xiangqi'
- stream.send(result)
-
- # xiangqi capabilities
xiangqi_caps = dbus.Dictionary({contact_handle:
[(text_fixed_properties, text_allowed_properties),
(stream_tube_fixed_properties, stream_tube_allowed_properties),
(dbus_tube_fixed_properties, dbus_tube_allowed_properties),
(xiangqi_fixed_properties, specialized_tube_allowed_properties)]})
- event = q.expect('dbus-signal', signal='ContactCapabilitiesChanged')
- assert len(event.args) == 1
- assert event.args[0] == xiangqi_caps
-
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == xiangqi_caps, caps
- # test again, to check GetContactCapabilities does not have side effect
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == xiangqi_caps, caps
- # check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
- assert caps_via_contacts_iface == caps[contact_handle], \
- caps_via_contacts_iface
+ receive_caps(q, conn, stream, contact, contact_handle,
+ [ns.TUBES + '/dbus#com.example.Xiangqi'], xiangqi_caps)
# send presence with both D-Bus and stream tube caps
- presence = make_presence(contact, status='hello')
- c = presence.addElement((ns.CAPS, 'c'))
- c['node'] = client
- c['ver'] = compute_caps_hash([], [ns.TUBES + '/dbus#com.example.Xiangqi',
- ns.TUBES + '/stream#daap'], [])
- c['hash'] = 'sha-1'
- stream.send(presence)
-
- # Gabble looks up our capabilities
- event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
- query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
- assert query_node.attributes['node'] == \
- client + '#' + c['ver']
-
- # send good reply
- result = make_result_iq(stream, event.stanza)
- query = result.firstChildElement()
- query['node'] = client + '#' + c['ver']
- feature = query.addElement('feature')
- feature['var'] = ns.TUBES + '/dbus#com.example.Xiangqi'
- feature = query.addElement('feature')
- feature['var'] = ns.TUBES + '/stream#daap'
- stream.send(result)
-
- # daap + xiangqi capabilities
daap_xiangqi_caps = dbus.Dictionary({contact_handle:
[(text_fixed_properties, text_allowed_properties),
(stream_tube_fixed_properties, stream_tube_allowed_properties),
(dbus_tube_fixed_properties, dbus_tube_allowed_properties),
(daap_fixed_properties, specialized_tube_allowed_properties),
(xiangqi_fixed_properties, specialized_tube_allowed_properties)]})
- event = q.expect('dbus-signal', signal='ContactCapabilitiesChanged')
- assert len(event.args) == 1
- assert event.args[0] == daap_xiangqi_caps
-
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == daap_xiangqi_caps, caps
- # test again, to check GetContactCapabilities does not have side effect
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == daap_xiangqi_caps, caps
- # check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
- assert caps_via_contacts_iface == caps[contact_handle], \
- caps_via_contacts_iface
+ receive_caps(q, conn, stream, contact, contact_handle,
+ [ns.TUBES + '/dbus#com.example.Xiangqi',
+ ns.TUBES + '/stream#daap',
+ ], daap_xiangqi_caps)
# send presence with 4 tube caps
- presence = make_presence(contact, status='hello')
- c = presence.addElement((ns.CAPS, 'c'))
- c['node'] = client
- c['ver'] = compute_caps_hash([], [ns.TUBES + '/dbus#com.example.Xiangqi',
- ns.TUBES + '/stream#daap', ns.TUBES + '/dbus#com.example.Go',
- ns.TUBES + '/stream#http' ], [])
- c['hash'] = 'sha-1'
- stream.send(presence)
-
- # Gabble looks up our capabilities
- event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
- query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
- assert query_node.attributes['node'] == \
- client + '#' + c['ver']
-
- # send good reply
- result = make_result_iq(stream, event.stanza)
- query = result.firstChildElement()
- query['node'] = client + '#' + c['ver']
- feature = query.addElement('feature')
- feature['var'] = ns.TUBES + '/dbus#com.example.Xiangqi'
- feature = query.addElement('feature')
- feature['var'] = ns.TUBES + '/dbus#com.example.Go'
- feature = query.addElement('feature')
- feature['var'] = ns.TUBES + '/stream#daap'
- feature = query.addElement('feature')
- feature['var'] = ns.TUBES + '/stream#http'
- stream.send(result)
-
- # http + daap + xiangqi + go capabilities
all_tubes_caps = dbus.Dictionary({contact_handle:
[(text_fixed_properties, text_allowed_properties),
(stream_tube_fixed_properties, stream_tube_allowed_properties),
@@ -332,55 +174,19 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
(http_fixed_properties, specialized_tube_allowed_properties),
(xiangqi_fixed_properties, specialized_tube_allowed_properties),
(go_fixed_properties, specialized_tube_allowed_properties)]})
- event = q.expect('dbus-signal', signal='ContactCapabilitiesChanged')
- assert len(event.args) == 1
- assert event.args[0] == all_tubes_caps
-
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == all_tubes_caps, caps
- # test again, to check GetContactCapabilities does not have side effect
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == all_tubes_caps, caps
- # check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
- assert caps_via_contacts_iface == caps[contact_handle], \
- caps_via_contacts_iface
+ receive_caps(q, conn, stream, contact, contact_handle,
+ [ns.TUBES + '/dbus#com.example.Xiangqi',
+ ns.TUBES + '/dbus#com.example.Go',
+ ns.TUBES + '/stream#daap',
+ ns.TUBES + '/stream#http',
+ ], all_tubes_caps)
# send presence with both D-Bus and stream tube caps
- presence = make_presence(contact, status='hello')
- c = presence.addElement((ns.CAPS, 'c'))
- c['node'] = client
- c['ver'] = compute_caps_hash([], [ns.TUBES + '/dbus#com.example.Xiangqi',
- ns.TUBES + '/stream#daap'], [])
- c['hash'] = 'sha-1'
- stream.send(presence)
-
# Gabble does not look up our capabilities because of the cache
-
- # daap + xiangqi capabilities
- daap_xiangqi_caps = dbus.Dictionary({contact_handle:
- [(text_fixed_properties, text_allowed_properties),
- (stream_tube_fixed_properties, stream_tube_allowed_properties),
- (dbus_tube_fixed_properties, dbus_tube_allowed_properties),
- (daap_fixed_properties, specialized_tube_allowed_properties),
- (xiangqi_fixed_properties, specialized_tube_allowed_properties)]})
- event = q.expect('dbus-signal', signal='ContactCapabilitiesChanged')
- assert len(event.args) == 1
- assert event.args[0] == daap_xiangqi_caps
-
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == daap_xiangqi_caps, caps
- # test again, to check GetContactCapabilities does not have side effect
- caps = conn_caps_iface.GetContactCapabilities([contact_handle])
- assert caps == daap_xiangqi_caps, caps
- # check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
- assert caps_via_contacts_iface == caps[contact_handle], \
- caps_via_contacts_iface
+ receive_caps(q, conn, stream, contact, contact_handle,
+ [ns.TUBES + '/dbus#com.example.Xiangqi',
+ ns.TUBES + '/stream#daap',
+ ], daap_xiangqi_caps, expect_disco=False)
def test_tube_caps_to_contact(q, bus, conn, stream):
basic_caps = dbus.Dictionary({1:
@@ -417,27 +223,24 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
(go_fixed_properties, specialized_tube_allowed_properties),
(ft_fixed_properties, ft_allowed_properties)]})
- conn_caps_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACT_CAPS)
- conn_contacts_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACTS)
-
# Check our own caps
- caps = conn_caps_iface.GetContactCapabilities([1])
+ caps = conn.ContactCapabilities.GetContactCapabilities([1])
assert caps == basic_caps, caps
# check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
+ caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
[1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
[1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise nothing
- conn_caps_iface.SetSelfCapabilities([])
+ conn.ContactCapabilities.SetSelfCapabilities([])
# Check our own caps
- caps = conn_caps_iface.GetContactCapabilities([1])
+ caps = conn.ContactCapabilities.GetContactCapabilities([1])
assert len(caps) == 1
assert caps == basic_caps, caps
# check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
+ caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
[1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
[1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
@@ -445,7 +248,7 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
sync_stream(q, stream)
# Advertise daap
- ret_caps = conn_caps_iface.SetSelfCapabilities(
+ ret_caps = conn.ContactCapabilities.SetSelfCapabilities(
[daap_fixed_properties])
# Expect Gabble to reply with the correct caps
@@ -460,16 +263,16 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert signaled_caps == daap_caps
# Check our own caps
- caps = conn_caps_iface.GetContactCapabilities([1])
+ caps = conn.ContactCapabilities.GetContactCapabilities([1])
assert caps == daap_caps, caps
# check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
+ caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
[1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
[1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise xiangqi
- ret_caps = conn_caps_iface.SetSelfCapabilities(
+ ret_caps = conn.ContactCapabilities.SetSelfCapabilities(
[xiangqi_fixed_properties])
# Expect Gabble to reply with the correct caps
@@ -484,16 +287,16 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert signaled_caps == xiangqi_caps
# Check our own caps
- caps = conn_caps_iface.GetContactCapabilities([1])
+ caps = conn.ContactCapabilities.GetContactCapabilities([1])
assert caps == xiangqi_caps, caps
# check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
+ caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
[1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
[1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise daap + xiangqi
- ret_caps = conn_caps_iface.SetSelfCapabilities(
+ ret_caps = conn.ContactCapabilities.SetSelfCapabilities(
[daap_fixed_properties, xiangqi_fixed_properties])
# Expect Gabble to reply with the correct caps
@@ -508,16 +311,16 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert signaled_caps == daap_xiangqi_caps
# Check our own caps
- caps = conn_caps_iface.GetContactCapabilities([1])
+ caps = conn.ContactCapabilities.GetContactCapabilities([1])
assert caps == daap_xiangqi_caps, caps
# check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
+ caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
[1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
[1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise 4 tubes
- ret_caps = conn_caps_iface.SetSelfCapabilities(
+ ret_caps = conn.ContactCapabilities.SetSelfCapabilities(
[daap_fixed_properties, http_fixed_properties,
go_fixed_properties, xiangqi_fixed_properties])
@@ -533,16 +336,16 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert signaled_caps == all_tubes_caps
# Check our own caps
- caps = conn_caps_iface.GetContactCapabilities([1])
+ caps = conn.ContactCapabilities.GetContactCapabilities([1])
assert caps == all_tubes_caps, caps
# check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
+ caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
[1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
[1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise daap + xiangqi
- ret_caps = conn_caps_iface.SetSelfCapabilities(
+ ret_caps = conn.ContactCapabilities.SetSelfCapabilities(
[daap_fixed_properties, xiangqi_fixed_properties])
# Expect Gabble to reply with the correct caps
@@ -557,10 +360,10 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert signaled_caps == daap_xiangqi_caps
# Check our own caps
- caps = conn_caps_iface.GetContactCapabilities([1])
+ caps = conn.ContactCapabilities.GetContactCapabilities([1])
assert caps == daap_xiangqi_caps, caps
# check the Contacts interface give the same caps
- caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
+ caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
[1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
[1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
@@ -570,10 +373,7 @@ def test(q, bus, conn, stream):
conn.Connect()
q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
- client = 'http://telepathy.freedesktop.org/fake-client'
-
- test_tube_caps_from_contact(q, bus, conn, stream, 'bilbo1 at foo.com/Foo',
- 2L, client)
+ test_tube_caps_from_contact(q, bus, conn, stream, 'bilbo1 at foo.com/Foo')
test_tube_caps_to_contact(q, bus, conn, stream)
--
1.5.6.5
More information about the telepathy-commits
mailing list