summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2011-10-27 14:36:10 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-10-27 16:37:13 +0100
commit816c32f7c72f9b808bf1b727f2f1906f68ba45e4 (patch)
tree9f3b79cd1db7e7aaaa15f8f1efd73d19fb377e47 /tests
parent9c8c3e7342dd417c50495d3c95fca576d3db558a (diff)
downloadtelepathy-salut-816c32f7c72f9b808bf1b727f2f1906f68ba45e4.tar.gz
ft-manager: add Metadata props to Allowed_Properties
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'tests')
-rw-r--r--tests/twisted/avahi/caps_helper.py5
-rw-r--r--tests/twisted/avahi/file-transfer/file_transfer_helper.py4
-rw-r--r--tests/twisted/constants.py3
3 files changed, 10 insertions, 2 deletions
diff --git a/tests/twisted/avahi/caps_helper.py b/tests/twisted/avahi/caps_helper.py
index 253264cd..ab5f0c28 100644
--- a/tests/twisted/avahi/caps_helper.py
+++ b/tests/twisted/avahi/caps_helper.py
@@ -124,7 +124,10 @@ ft_allowed_properties = dbus.Array([
cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHash',
cs.CHANNEL_TYPE_FILE_TRANSFER + '.Description',
cs.CHANNEL_TYPE_FILE_TRANSFER + '.Date',
- cs.FT_URI])
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset',
+ cs.FT_URI,
+ cs.FT_SERVICE_NAME,
+ cs.FT_METADATA])
fake_client_dataforms = {
'urn:xmpp:dataforms:softwareinfo':
diff --git a/tests/twisted/avahi/file-transfer/file_transfer_helper.py b/tests/twisted/avahi/file-transfer/file_transfer_helper.py
index ce102bd0..031180ee 100644
--- a/tests/twisted/avahi/file-transfer/file_transfer_helper.py
+++ b/tests/twisted/avahi/file-transfer/file_transfer_helper.py
@@ -305,7 +305,9 @@ class SendFileTest(FileTransferTest):
cs.FT_DESCRIPTION,
cs.FT_DATE,
cs.FT_INITIAL_OFFSET,
- cs.FT_URI],
+ cs.FT_URI,
+ cs.FT_SERVICE_NAME,
+ cs.FT_METADATA],
) in properties.get('RequestableChannelClasses', []),\
properties.get('RequestableChannelClasses')
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index cc9be081..5b42d315 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -26,6 +26,7 @@ CHANNEL_IFACE_PASSWORD = CHANNEL + ".Interface.Password"
CHANNEL_IFACE_TUBE = CHANNEL + ".Interface.Tube"
CHANNEL_IFACE_SASL_AUTH = CHANNEL + ".Interface.SASLAuthentication"
CHANNEL_IFACE_CONFERENCE = CHANNEL + '.Interface.Conference'
+CHANNEL_IFACE_FILE_TRANSFER_METADATA = CHANNEL + '.Interface.FileTransfer.Metadata'
CHANNEL_TYPE_CALL = CHANNEL + ".Type.Call.DRAFT"
CHANNEL_TYPE_CONTACT_LIST = CHANNEL + ".Type.ContactList"
@@ -264,6 +265,8 @@ FT_TRANSFERRED_BYTES = CHANNEL_TYPE_FILE_TRANSFER + '.TransferredBytes'
FT_INITIAL_OFFSET = CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset'
FT_FILE_COLLECTION = CHANNEL_TYPE_FILE_TRANSFER + '.FUTURE.FileCollection'
FT_URI = CHANNEL_TYPE_FILE_TRANSFER + '.URI'
+FT_SERVICE_NAME = CHANNEL_IFACE_FILE_TRANSFER_METADATA + '.ServiceName'
+FT_METADATA = CHANNEL_IFACE_FILE_TRANSFER_METADATA + '.Metadata'
GF_CAN_ADD = 1
GF_CAN_REMOVE = 2