1 files changed, 5 insertions, 15 deletions
diff --git a/tests/twisted/dispatcher/dispatch-before-connected.py b/tests/twisted/dispatcher/dispatch-before-connected.py
index 9925e0fe..1037ef4c 100644
--- a/tests/twisted/dispatcher/dispatch-before-connected.py
+++ b/tests/twisted/dispatcher/dispatch-before-connected.py
@@ -29,17 +29,10 @@ from mctest import exec_test, SimulatedConnection, SimulatedClient, \
         expect_client_setup
 import constants as cs
 
-CHANNEL_TYPE_SERVER_VERIFICATION = \
-    'org.freedesktop.Telepathy.Channel.Type.ServerVerification.DRAFT'
-CHANNEL_IFACE_VERIFICATION = \
-    'org.freedesktop.Telepathy.Channel.Interface.Verification.DRAFT '
-CHANNEL_IFACE_IDENT_EXCHANGE = \
-    'org.freedesktop.Telepathy.Channel.Interface.IdentityExchange.DRAFT'
-
 def test(q, bus, mc):
     params = dbus.Dictionary({"account": "someone@example.com",
         "password": "secrecy"}, signature='sv')
-    (cm_name_ref, account) = create_fakecm_account(q, bus, mc, params)
+    (simulated_cm, account) = create_fakecm_account(q, bus, mc, params)
 
     account_iface = dbus.Interface(account, cs.ACCOUNT)
     account_props = dbus.Interface(account, cs.PROPERTIES_IFACE)
@@ -49,7 +42,7 @@ def test(q, bus, mc):
 
     verification_filter = dbus.Dictionary({
         cs.CHANNEL + '.TargetHandleType': 0,
-        cs.CHANNEL + '.ChannelType': CHANNEL_TYPE_SERVER_VERIFICATION,
+        cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_SERVER_TLS_CONNECTION,
         }, signature='sv')
 
     verifier_bus = dbus.bus.BusConnection()
@@ -61,7 +54,7 @@ def test(q, bus, mc):
     expect_client_setup(q, [verifier])
 
     account_props.Set(cs.ACCOUNT, 'RequestedPresence',
-                      (dbus.UInt32(cs.PRESENCE_TYPE_AVAILABLE), 'available', ''))
+                      (dbus.UInt32(cs.PRESENCE_AVAILABLE), 'available', ''))
 
     account_props.Set(cs.ACCOUNT, 'Enabled', True)
 
@@ -73,7 +66,7 @@ def test(q, bus, mc):
             handled=False)
 
     conn = SimulatedConnection(q, bus, 'fakecm', 'fakeprotocol', '_',
-            'myself', has_requests=True, has_presence=True)
+            'myself', has_presence=True)
 
     q.dbus_return(e.message, conn.bus_name, conn.object_path, signature='so')
 
@@ -87,10 +80,7 @@ def test(q, bus, mc):
     channel_properties[cs.CHANNEL + '.InitiatorID'] = ''
     channel_properties[cs.CHANNEL + '.InitiatorHandle'] = 0
     channel_properties[cs.CHANNEL + '.Requested'] = False
-    channel_properties[cs.CHANNEL + '.Interfaces'] = dbus.Array([
-            CHANNEL_IFACE_IDENT_EXCHANGE,
-            CHANNEL_IFACE_VERIFICATION,
-            cs.CHANNEL], signature='s')
+    channel_properties[cs.CHANNEL + '.Interfaces'] = dbus.Array([], signature='s')
 
     chan = SimulatedChannel(conn, channel_properties)
     chan.announce()