telepathy-gabble: Fix file transfer tests for these new interfaces

[Will Thompson]

Module: telepathy-gabble
Branch: master
Commit: 57ba5c87466279069bf332006e2d0947c4807633
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=57ba5c87466279069bf332006e2d0947c4807633

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Thu Dec  6 11:18:15 2012 +0000

Fix file transfer tests for these new interfaces

---

 .../twisted/file-transfer/file_transfer_helper.py  |   12 +++++++++---
 tests/twisted/jingle-share/file_transfer_helper.py |   12 +++++++++---
 tests/twisted/jingle-share/test-multift.py         |    9 ++++++---
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/tests/twisted/file-transfer/file_transfer_helper.py b/tests/twisted/file-transfer/file_transfer_helper.py
index 4b72379..79b3acf 100644
--- a/tests/twisted/file-transfer/file_transfer_helper.py
+++ b/tests/twisted/file-transfer/file_transfer_helper.py
@@ -5,7 +5,7 @@ import time
 import datetime
 import os
 
-from servicetest import EventPattern, assertEquals, call_async
+from servicetest import EventPattern, assertEquals, assertSameSets, call_async
 from gabbletest import exec_test, sync_stream, make_result_iq
 import ns
 from bytestream import create_from_si_offer, announce_socks5_proxy
@@ -218,7 +218,10 @@ class ReceiveFileTest(FileTransferTest):
         # check channel properties
         # org.freedesktop.Telepathy.Channel D-Bus properties
         assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_FILE_TRANSFER
-        assert props[cs.INTERFACES] == []
+        assertSameSets(
+            [ cs.CHANNEL_IFACE_FILE_TRANSFER_METADATA,
+              cs.CHANNEL_TYPE_FILE_TRANSFER + '.FUTURE',
+            ], props[cs.INTERFACES])
         assert props[cs.TARGET_HANDLE] == self.handle
         assert props[cs.TARGET_ID] == self.contact_name
         assert props[cs.TARGET_HANDLE_TYPE] == cs.HT_CONTACT
@@ -408,7 +411,10 @@ class SendFileTest(FileTransferTest):
 
         # org.freedesktop.Telepathy.Channel D-Bus properties
         assertEquals(cs.CHANNEL_TYPE_FILE_TRANSFER, props[cs.CHANNEL_TYPE])
-        assertEquals([], props[cs.INTERFACES])
+        assertSameSets(
+            [ cs.CHANNEL_IFACE_FILE_TRANSFER_METADATA,
+              cs.CHANNEL_TYPE_FILE_TRANSFER + '.FUTURE',
+            ], props[cs.INTERFACES])
         assertEquals(self.handle, props[cs.TARGET_HANDLE])
         assertEquals(self.contact_name, props[cs.TARGET_ID])
         assertEquals(cs.HT_CONTACT, props[cs.TARGET_HANDLE_TYPE])
diff --git a/tests/twisted/jingle-share/file_transfer_helper.py b/tests/twisted/jingle-share/file_transfer_helper.py
index 2fe0087..19a45ca 100644
--- a/tests/twisted/jingle-share/file_transfer_helper.py
+++ b/tests/twisted/jingle-share/file_transfer_helper.py
@@ -4,7 +4,7 @@ import hashlib
 import time
 import datetime
 
-from servicetest import EventPattern, TimeoutError, assertEquals, assertLength
+from servicetest import EventPattern, assertEquals, assertLength, assertSameSets
 from gabbletest import exec_test, sync_stream, make_result_iq, elem_iq, elem
 import ns
 
@@ -273,7 +273,10 @@ class ReceiveFileTest(FileTransferTest):
         # check channel properties
         # org.freedesktop.Telepathy.Channel D-Bus properties
         assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_FILE_TRANSFER, props
-        assert props[cs.INTERFACES] == [], props
+        assertSameSets(
+            [ cs.CHANNEL_IFACE_FILE_TRANSFER_METADATA,
+              cs.CHANNEL_TYPE_FILE_TRANSFER + '.FUTURE',
+            ], props[cs.INTERFACES])
         assert props[cs.TARGET_HANDLE] == self.handle, props
         assert props[cs.TARGET_ID] == self.target, props
         assert props[cs.TARGET_HANDLE_TYPE] == cs.HT_CONTACT, props
@@ -425,7 +428,10 @@ class SendFileTest(FileTransferTest):
 
         # org.freedesktop.Telepathy.Channel D-Bus properties
         assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_FILE_TRANSFER
-        assert props[cs.INTERFACES] == []
+        assertSameSets(
+            [ cs.CHANNEL_IFACE_FILE_TRANSFER_METADATA,
+              cs.CHANNEL_TYPE_FILE_TRANSFER + '.FUTURE',
+            ], props[cs.INTERFACES])
         assert props[cs.TARGET_HANDLE] == self.handle
         assert props[cs.TARGET_ID] == self.target
         assert props[cs.TARGET_HANDLE_TYPE] == cs.HT_CONTACT
diff --git a/tests/twisted/jingle-share/test-multift.py b/tests/twisted/jingle-share/test-multift.py
index 7916281..8ebf8e2 100644
--- a/tests/twisted/jingle-share/test-multift.py
+++ b/tests/twisted/jingle-share/test-multift.py
@@ -3,8 +3,8 @@ import dbus
 from twisted.words.xish import xpath
 from twisted.words.protocols.jabber.client import IQ
 
-from servicetest import (assertEquals, EventPattern, TimeoutError)
-from gabbletest import exec_test, make_result_iq, sync_stream, make_presence
+from servicetest import assertEquals, assertSameSets, EventPattern, TimeoutError
+from gabbletest import exec_test
 import constants as cs
 
 from caps_helper import compute_caps_hash, \
@@ -102,7 +102,10 @@ def test(q, bus, conn, stream):
                 assert props[cs.FT_SIZE] == size, props
 
         assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_FILE_TRANSFER, props
-        assert props[cs.INTERFACES] == [], props
+        assertSameSets(
+            [ cs.CHANNEL_IFACE_FILE_TRANSFER_METADATA,
+              cs.CHANNEL_TYPE_FILE_TRANSFER + '.FUTURE',
+            ], props[cs.INTERFACES])
         assert props[cs.TARGET_HANDLE] == 2L, props
         assert props[cs.TARGET_ID] == contact.replace("/Resource", ""), props
         assert props[cs.TARGET_HANDLE_TYPE] == cs.HT_CONTACT, props