[telepathy-mission-control/master] test/twisted: make connections with misc extra interfaces more scalable

[Simon McVittie]

---
 test/twisted/capabilities/legacy-caps.py |    2 +-
 test/twisted/mctest.py                   |   13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/test/twisted/capabilities/legacy-caps.py b/test/twisted/capabilities/legacy-caps.py
index a74072a..73ce5f0 100644
--- a/test/twisted/capabilities/legacy-caps.py
+++ b/test/twisted/capabilities/legacy-caps.py
@@ -65,7 +65,7 @@ def test(q, bus, mc):
         "password": "secrecy"}, signature='sv')
     cm_name_ref, account = create_fakecm_account(q, bus, mc, params)
     conn = enable_fakecm_account(q, bus, mc, account, params,
-            has_old_caps=True,
+            extra_interfaces=[cs.CONN_IFACE_CAPS],
             expect_after_connect=[
                 EventPattern('dbus-method-call', handled=False,
                     interface=cs.CONN_IFACE_CAPS,
diff --git a/test/twisted/mctest.py b/test/twisted/mctest.py
index 5df1221..27afd11 100644
--- a/test/twisted/mctest.py
+++ b/test/twisted/mctest.py
@@ -159,7 +159,7 @@ class SimulatedConnection(object):
     def __init__(self, q, bus, cmname, protocol, account_part, self_ident,
             implement_get_interfaces=True, has_requests=True,
             has_presence=False, has_aliasing=False, has_avatars=False,
-            avatars_persist=True, has_old_caps=False):
+            avatars_persist=True, extra_interfaces=[]):
         self.q = q
         self.bus = bus
 
@@ -181,7 +181,7 @@ class SimulatedConnection(object):
         self.has_aliasing = has_aliasing
         self.has_avatars = has_avatars
         self.avatars_persist = avatars_persist
-        self.has_old_caps = has_old_caps
+        self.extra_interfaces = extra_interfaces[:]
 
         if self.avatars_persist:
             self.avatar = dbus.Struct((dbus.ByteArray('my old avatar'),
@@ -358,8 +358,8 @@ class SimulatedConnection(object):
         if self.has_presence:
             interfaces.append(cs.CONN_IFACE_SIMPLE_PRESENCE)
 
-        if self.has_old_caps:
-            interfaces.append(cs.CONN_IFACE_CAPS)
+        if self.extra_interfaces:
+            interfaces.extend(self.extra_interfaces)
 
         self.q.dbus_return(e.message, interfaces, signature='as')
 
@@ -739,7 +739,8 @@ def create_fakecm_account(q, bus, mc, params):
 
 def enable_fakecm_account(q, bus, mc, account, expected_params,
         has_requests=True, has_presence=False, has_aliasing=False,
-        has_avatars=False, avatars_persist=True, has_old_caps=False,
+        has_avatars=False, avatars_persist=True,
+        extra_interfaces=[],
         requested_presence=(2, 'available', ''),
         expect_after_connect=[]):
     # Enable the account
@@ -765,7 +766,7 @@ def enable_fakecm_account(q, bus, mc, account, expected_params,
     conn = SimulatedConnection(q, bus, 'fakecm', 'fakeprotocol', '_',
             'myself', has_requests=has_requests, has_presence=has_presence,
             has_aliasing=has_aliasing, has_avatars=has_avatars,
-            avatars_persist=avatars_persist, has_old_caps=has_old_caps)
+            avatars_persist=avatars_persist, extra_interfaces=extra_interfaces)
 
     q.dbus_return(e.message, conn.bus_name, conn.object_path, signature='so')
 
-- 
1.5.6.5