[Telepathy-commits] [telepathy-gabble/master] tests/twisted: Use conn.Requests instead of making a dbus.Interface
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Mar 11 05:50:51 PDT 2009
---
tests/twisted/jingle/google-relay.py | 4 +---
tests/twisted/jingle/outgoing-many-streams.py | 4 +---
tests/twisted/jingle/test-outgoing-call-ensure.py | 10 +++-------
.../jingle/test-outgoing-call-requestotron.py | 4 +---
tests/twisted/muc/roomlist.py | 7 ++-----
tests/twisted/muc/test-ensure.py | 14 ++++----------
tests/twisted/roster/ensure.py | 6 ++----
tests/twisted/roster/request-group-after-roster.py | 4 +---
tests/twisted/text/ensure.py | 19 ++++++++-----------
tests/twisted/text/initiate-requestotron.py | 4 +---
tests/twisted/text/send-error.py | 8 ++------
tests/twisted/text/test-chat-state.py | 4 +---
.../twisted/tubes/create-invalid-tube-channels.py | 5 ++---
tests/twisted/tubes/ensure-si-tube.py | 6 ++----
tests/twisted/tubes/offer-muc-stream-tube.py | 3 +--
tests/twisted/tubes/offer-private-dbus-tube.py | 3 +--
tests/twisted/tubes/offer-private-stream-tube.py | 4 +---
tests/twisted/tubes/request-invalid-dbus-tube.py | 4 +---
18 files changed, 35 insertions(+), 78 deletions(-)
diff --git a/tests/twisted/jingle/google-relay.py b/tests/twisted/jingle/google-relay.py
index d408178..078a253 100644
--- a/tests/twisted/jingle/google-relay.py
+++ b/tests/twisted/jingle/google-relay.py
@@ -155,9 +155,7 @@ def test(q, bus, conn, stream, incoming=True):
e = q.expect('dbus-signal', signal='MembersChanged',
args=[u'', [], [], [1L], [], remote_handle, 0])
else:
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.StreamedMedia',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
diff --git a/tests/twisted/jingle/outgoing-many-streams.py b/tests/twisted/jingle/outgoing-many-streams.py
index 706f949..63beb84 100644
--- a/tests/twisted/jingle/outgoing-many-streams.py
+++ b/tests/twisted/jingle/outgoing-many-streams.py
@@ -47,9 +47,7 @@ def test(q, bus, conn, stream):
handle = conn.RequestHandles(1, [jt.remote_jid])[0]
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.StreamedMedia',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
diff --git a/tests/twisted/jingle/test-outgoing-call-ensure.py b/tests/twisted/jingle/test-outgoing-call-ensure.py
index a14e453..3364f85 100644
--- a/tests/twisted/jingle/test-outgoing-call-ensure.py
+++ b/tests/twisted/jingle/test-outgoing-call-ensure.py
@@ -46,12 +46,8 @@ def test(q, bus, conn, stream):
handle = conn.RequestHandles(1, [jt.remote_jid])[0]
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
-
-
# Ensure a channel that doesn't exist yet.
- call_async(q, requestotron, 'EnsureChannel',
+ call_async(q, conn.Requests, 'EnsureChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.StreamedMedia',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
@@ -103,7 +99,7 @@ def test(q, bus, conn, stream):
# Now ensure a media channel with the same contact, and check it's the
# same.
- call_async(q, requestotron, 'EnsureChannel',
+ call_async(q, conn.Requests, 'EnsureChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.StreamedMedia',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
@@ -173,7 +169,7 @@ def test(q, bus, conn, stream):
# Now, Ensuring a media channel with handle should yield the channel just
# created.
- call_async(q, requestotron, 'EnsureChannel',
+ call_async(q, conn.Requests, 'EnsureChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.StreamedMedia',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
diff --git a/tests/twisted/jingle/test-outgoing-call-requestotron.py b/tests/twisted/jingle/test-outgoing-call-requestotron.py
index 3237912..4f9202c 100644
--- a/tests/twisted/jingle/test-outgoing-call-requestotron.py
+++ b/tests/twisted/jingle/test-outgoing-call-requestotron.py
@@ -47,9 +47,7 @@ def test(q, bus, conn, stream):
handle = conn.RequestHandles(1, [jt.remote_jid])[0]
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.StreamedMedia',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
diff --git a/tests/twisted/muc/roomlist.py b/tests/twisted/muc/roomlist.py
index f5c343d..b7234c8 100644
--- a/tests/twisted/muc/roomlist.py
+++ b/tests/twisted/muc/roomlist.py
@@ -109,9 +109,7 @@ def test(q, bus, conn, stream):
# FIXME: actually list the rooms!
- requestotron = dbus.Interface(conn,
- tp_name_prefix + '.Connection.Interface.Requests')
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{ tp_name_prefix + '.Channel.ChannelType':
tp_name_prefix + '.Channel.Type.RoomList',
tp_name_prefix + '.Channel.TargetHandleType': 0,
@@ -157,8 +155,7 @@ def test(q, bus, conn, stream):
# FIXME: actually list the rooms!
-
- call_async(q, requestotron, 'EnsureChannel',
+ call_async(q, conn.Requests, 'EnsureChannel',
{ tp_name_prefix + '.Channel.ChannelType':
tp_name_prefix + '.Channel.Type.RoomList',
tp_name_prefix + '.Channel.TargetHandleType': 0,
diff --git a/tests/twisted/muc/test-ensure.py b/tests/twisted/muc/test-ensure.py
index e04b362..ecf5cb9 100644
--- a/tests/twisted/muc/test-ensure.py
+++ b/tests/twisted/muc/test-ensure.py
@@ -42,17 +42,14 @@ def test(q, bus, conn, stream):
return True
def test_create_ensure(q, conn, bus, stream, room_jid, room_handle):
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
-
# Call both Create and Ensure for the same channel.
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.Text',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 2,
'org.freedesktop.Telepathy.Channel.TargetHandle': room_handle,
})
- call_async(q, requestotron, 'EnsureChannel',
+ call_async(q, conn.Requests, 'EnsureChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.Text',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 2,
@@ -116,17 +113,14 @@ def test_create_ensure(q, conn, bus, stream, room_jid, room_handle):
def test_ensure_ensure(q, conn, bus, stream, room_jid, room_handle):
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
-
# Call Ensure twice for the same channel.
- call_async(q, requestotron, 'EnsureChannel',
+ call_async(q, conn.Requests, 'EnsureChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.Text',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 2,
'org.freedesktop.Telepathy.Channel.TargetHandle': room_handle,
})
- call_async(q, requestotron, 'EnsureChannel',
+ call_async(q, conn.Requests, 'EnsureChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.Text',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 2,
diff --git a/tests/twisted/roster/ensure.py b/tests/twisted/roster/ensure.py
index 44dfd61..f75ee93 100644
--- a/tests/twisted/roster/ensure.py
+++ b/tests/twisted/roster/ensure.py
@@ -25,15 +25,13 @@ def test(q, bus, conn, stream):
# send an empty roster
stream.send(roster_event.stanza)
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
- call_async(q, requestotron, 'EnsureChannel',
+ call_async(q, conn.Requests, 'EnsureChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.ContactList',
'org.freedesktop.Telepathy.Channel.TargetHandleType': HT_GROUP,
'org.freedesktop.Telepathy.Channel.TargetHandle': test_handle,
})
- call_async(q, requestotron, 'EnsureChannel',
+ call_async(q, conn.Requests, 'EnsureChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.ContactList',
'org.freedesktop.Telepathy.Channel.TargetHandleType': HT_GROUP,
diff --git a/tests/twisted/roster/request-group-after-roster.py b/tests/twisted/roster/request-group-after-roster.py
index 9ab444c..56be251 100644
--- a/tests/twisted/roster/request-group-after-roster.py
+++ b/tests/twisted/roster/request-group-after-roster.py
@@ -29,9 +29,7 @@ def test(q, bus, conn, stream):
sync_stream(q, stream)
sync_dbus(bus, q, conn)
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.ContactList',
'org.freedesktop.Telepathy.Channel.TargetHandleType': HT_GROUP,
diff --git a/tests/twisted/text/ensure.py b/tests/twisted/text/ensure.py
index 6edd6bc..f83c112 100644
--- a/tests/twisted/text/ensure.py
+++ b/tests/twisted/text/ensure.py
@@ -35,24 +35,21 @@ def test(q, bus, conn, stream):
) in properties.get('RequestableChannelClasses'),\
properties['RequestableChannelClasses']
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
-
- test_ensure_ensure(q, requestotron, conn, self_handle, jids[0], handles[0])
- test_request_ensure(q, requestotron, conn, self_handle, jids[1], handles[1])
+ test_ensure_ensure(q, conn, self_handle, jids[0], handles[0])
+ test_request_ensure(q, conn, self_handle, jids[1], handles[1])
conn.Disconnect()
q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
-def test_ensure_ensure(q, requestotron, conn, self_handle, jid, handle):
+def test_ensure_ensure(q, conn, self_handle, jid, handle):
"""
Test ensuring a non-existant channel twice. The first call should succeed
with Yours=True; the subsequent call should succeed with Yours=False
"""
# Check that Ensuring a channel that doesn't exist succeeds
- call_async(q, requestotron, 'EnsureChannel', request_props (handle))
+ call_async(q, conn.Requests, 'EnsureChannel', request_props (handle))
ret, old_sig, new_sig = q.expect_many(
EventPattern('dbus-return', method='EnsureChannel'),
@@ -94,7 +91,7 @@ def test_ensure_ensure(q, requestotron, conn, self_handle, jid, handle):
# Now try Ensuring a channel which already exists
- call_async(q, requestotron, 'EnsureChannel', request_props (handle))
+ call_async(q, conn.Requests, 'EnsureChannel', request_props (handle))
ret_ = q.expect('dbus-return', method='EnsureChannel')
assert len(ret_.value) == 3
@@ -107,13 +104,13 @@ def test_ensure_ensure(q, requestotron, conn, self_handle, jid, handle):
assert emitted_props == emitted_props_, (emitted_props, emitted_props_)
-def test_request_ensure(q, requestotron, conn, self_handle, jid, handle):
+def test_request_ensure(q, conn, self_handle, jid, handle):
"""
Test Creating a non-existant channel, then Ensuring the same channel.
The call to Ensure should succeed with Yours=False.
"""
- call_async(q, requestotron, 'CreateChannel', request_props (handle))
+ call_async(q, conn.Requests, 'CreateChannel', request_props (handle))
ret, old_sig, new_sig = q.expect_many(
EventPattern('dbus-return', method='CreateChannel'),
@@ -151,7 +148,7 @@ def test_request_ensure(q, requestotron, conn, self_handle, jid, handle):
# Now try Ensuring that same channel.
- call_async(q, requestotron, 'EnsureChannel', request_props (handle))
+ call_async(q, conn.Requests, 'EnsureChannel', request_props (handle))
ret_ = q.expect('dbus-return', method='EnsureChannel')
assert len(ret_.value) == 3
diff --git a/tests/twisted/text/initiate-requestotron.py b/tests/twisted/text/initiate-requestotron.py
index b1568f2..6a69b27 100644
--- a/tests/twisted/text/initiate-requestotron.py
+++ b/tests/twisted/text/initiate-requestotron.py
@@ -35,9 +35,7 @@ def test(q, bus, conn, stream):
) in properties.get('RequestableChannelClasses'),\
properties['RequestableChannelClasses']
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.Text',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
diff --git a/tests/twisted/text/send-error.py b/tests/twisted/text/send-error.py
index 43c7f90..fad520a 100644
--- a/tests/twisted/text/send-error.py
+++ b/tests/twisted/text/send-error.py
@@ -25,9 +25,7 @@ def test_temporary_error(q, bus, conn, stream):
'org.freedesktop.Telepathy.Connection.Interface.Requests',
dbus_interface='org.freedesktop.DBus.Properties')
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.Text',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
@@ -112,9 +110,7 @@ def test_permanent_error(q, bus, conn, stream):
'org.freedesktop.Telepathy.Connection.Interface.Requests',
dbus_interface='org.freedesktop.DBus.Properties')
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.Text',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
diff --git a/tests/twisted/text/test-chat-state.py b/tests/twisted/text/test-chat-state.py
index 1526ee8..ec92a8e 100644
--- a/tests/twisted/text/test-chat-state.py
+++ b/tests/twisted/text/test-chat-state.py
@@ -25,9 +25,7 @@ def test(q, bus, conn, stream):
jid = 'foo at bar.com'
foo_handle = conn.RequestHandles(1, [jid])[0]
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.Text',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
diff --git a/tests/twisted/tubes/create-invalid-tube-channels.py b/tests/twisted/tubes/create-invalid-tube-channels.py
index 78be002..0aed251 100644
--- a/tests/twisted/tubes/create-invalid-tube-channels.py
+++ b/tests/twisted/tubes/create-invalid-tube-channels.py
@@ -24,11 +24,10 @@ def test(q, bus, conn, stream):
q.expect('dbus-signal', signal='StatusChanged', args=[0, 1]),
conn_props = dbus.Interface(conn, PROPERTIES_IFACE)
- requestotron = dbus.Interface(conn, CONN_IFACE_REQUESTS)
# Try to CreateChannel with unknown properties
# Gabble must return an error
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{CHANNEL_TYPE: CHANNEL_TYPE_STREAM_TUBE,
TARGET_HANDLE_TYPE: HT_CONTACT,
TARGET_ID: "foo at example.com",
@@ -41,7 +40,7 @@ def test(q, bus, conn, stream):
# Try to CreateChannel with missing properties ("Service")
# Gabble must return an error
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{CHANNEL_TYPE: CHANNEL_TYPE_STREAM_TUBE,
TARGET_HANDLE_TYPE: HT_CONTACT,
TARGET_ID: "foo at example.com",
diff --git a/tests/twisted/tubes/ensure-si-tube.py b/tests/twisted/tubes/ensure-si-tube.py
index 67b6428..bfbb174 100644
--- a/tests/twisted/tubes/ensure-si-tube.py
+++ b/tests/twisted/tubes/ensure-si-tube.py
@@ -100,9 +100,7 @@ def test(q, bus, conn, stream):
# Ensure a tube to the same person; check it's the same one.
- requestotron = dbus.Interface(conn,
- 'org.freedesktop.Telepathy.Connection.Interface.Requests')
- call_async(q, requestotron, 'EnsureChannel',
+ call_async(q, conn.Requests, 'EnsureChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.Tubes',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
@@ -120,7 +118,7 @@ def test(q, bus, conn, stream):
# Now let's try ensuring a new tube.
- call_async(q, requestotron, 'EnsureChannel',
+ call_async(q, conn.Requests, 'EnsureChannel',
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
'org.freedesktop.Telepathy.Channel.Type.Tubes',
'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
diff --git a/tests/twisted/tubes/offer-muc-stream-tube.py b/tests/twisted/tubes/offer-muc-stream-tube.py
index bdedbe1..7d6295f 100644
--- a/tests/twisted/tubes/offer-muc-stream-tube.py
+++ b/tests/twisted/tubes/offer-muc-stream-tube.py
@@ -252,9 +252,8 @@ def test(q, bus, conn, stream, bytestream_cls):
# offer a stream tube to another room (new API)
srv_path = set_up_listener_socket(q, '/stream2')
- requestotron = dbus.Interface(conn, cs.CONN_IFACE_REQUESTS)
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_STREAM_TUBE,
cs.TARGET_HANDLE_TYPE: cs.HT_ROOM,
cs.TARGET_ID: 'chat2 at conf.localhost',
diff --git a/tests/twisted/tubes/offer-private-dbus-tube.py b/tests/twisted/tubes/offer-private-dbus-tube.py
index 74cc3e4..60b7cfd 100644
--- a/tests/twisted/tubes/offer-private-dbus-tube.py
+++ b/tests/twisted/tubes/offer-private-dbus-tube.py
@@ -162,11 +162,10 @@ def offer_old_dbus_tube(q, bus, conn, stream, self_handle, alice_handle, bytestr
def offer_new_dbus_tube(q, bus, conn, stream, self_handle, alice_handle, bytestream_cls):
- requestotron = dbus.Interface(conn, cs.CONN_IFACE_REQUESTS)
# Offer a tube to Alice (new API)
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_DBUS_TUBE,
cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
cs.TARGET_ID: 'alice at localhost',
diff --git a/tests/twisted/tubes/offer-private-stream-tube.py b/tests/twisted/tubes/offer-private-stream-tube.py
index 8c6571a..95f582d 100644
--- a/tests/twisted/tubes/offer-private-stream-tube.py
+++ b/tests/twisted/tubes/offer-private-stream-tube.py
@@ -97,8 +97,6 @@ def test(q, bus, conn, stream, bytestream_cls):
# RequestChannel are the ones we wanted.
sync_dbus(bus, q, conn)
- requestotron = dbus.Interface(conn, cs.CONN_IFACE_REQUESTS)
-
# Test tubes with Bob. Bob has tube capabilities.
bob_handle = conn.RequestHandles(1, ['bob at localhost'])[0]
@@ -125,7 +123,7 @@ def test(q, bus, conn, stream, bytestream_cls):
# Try CreateChannel with correct properties
# Gabble must succeed
- call_async(q, requestotron, 'CreateChannel',
+ call_async(q, conn.Requests, 'CreateChannel',
{cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_STREAM_TUBE,
cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
cs.TARGET_HANDLE: bob_handle,
diff --git a/tests/twisted/tubes/request-invalid-dbus-tube.py b/tests/twisted/tubes/request-invalid-dbus-tube.py
index cdfc5fe..fb84659 100644
--- a/tests/twisted/tubes/request-invalid-dbus-tube.py
+++ b/tests/twisted/tubes/request-invalid-dbus-tube.py
@@ -14,11 +14,9 @@ def test(q, bus, conn, stream):
conn.Connect()
q.expect('dbus-signal', signal='StatusChanged', args=[0L, 1L])
- requestotron = dbus.Interface(conn, CONN_IFACE_REQUESTS)
-
for invalid_service_name in invalid_service_names:
try:
- requestotron.CreateChannel(
+ conn.Requests.CreateChannel(
{CHANNEL_TYPE: CHANNEL_TYPE_DBUS_TUBE,
TARGET_HANDLE_TYPE: HT_CONTACT,
TARGET_ID: 'alice at localhost',
--
1.5.6.5
More information about the telepathy-commits
mailing list