[Telepathy-commits] [telepathy-gabble/master] Move TargetID from the future into the present.
Simon McVittie
simon.mcvittie at collabora.co.uk
Mon Aug 18 13:08:50 PDT 2008
As of last Friday's telepathy-spec 0.17.9, TargetID is part of Channel.
(Also adjust the regression tests for this change.)
---
src/im-channel.c | 4 ++--
src/media-channel.c | 4 ++--
src/muc-channel.c | 4 ++--
src/roomlist-channel.c | 4 ++--
src/roster-channel.c | 4 ++--
src/tubes-channel.c | 4 ++--
tests/twisted/jingle/test-incoming-call-reject.py | 8 ++++----
.../jingle/test-outgoing-call-deprecated.py | 6 +++++-
.../jingle/test-outgoing-call-deprecated2.py | 6 +++++-
tests/twisted/jingle/test-outgoing-call.py | 2 +-
tests/twisted/muc/roomlist.py | 2 +-
tests/twisted/muc/test-muc-invitation.py | 6 +++++-
tests/twisted/muc/test-muc.py | 2 +-
tests/twisted/roster/groups.py | 6 +++++-
tests/twisted/roster/test-roster.py | 2 +-
tests/twisted/text/initiate.py | 4 ++--
tests/twisted/text/respawn.py | 16 ++++++++++++----
tests/twisted/text/test-text.py | 4 ++--
.../tubes/test-muc-accept-stream-tube-ibb.py | 6 +++++-
tests/twisted/tubes/test-muc-offer-dbus-tube.py | 2 +-
tests/twisted/tubes/test-si-tubes.py | 2 +-
21 files changed, 63 insertions(+), 35 deletions(-)
diff --git a/src/im-channel.c b/src/im-channel.c
index 8c350f5..2695a3e 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -220,7 +220,7 @@ gabble_im_channel_get_property (GObject *object,
TP_IFACE_CHANNEL, "TargetHandle",
TP_IFACE_CHANNEL, "TargetHandleType",
TP_IFACE_CHANNEL, "ChannelType",
- GABBLE_IFACE_CHANNEL_FUTURE, "TargetID",
+ TP_IFACE_CHANNEL, "TargetID",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorHandle",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorID",
GABBLE_IFACE_CHANNEL_FUTURE, "Requested",
@@ -280,13 +280,13 @@ gabble_im_channel_class_init (GabbleIMChannelClass *gabble_im_channel_class)
static TpDBusPropertiesMixinPropImpl channel_props[] = {
{ "TargetHandleType", "handle-type", NULL },
{ "TargetHandle", "handle", NULL },
+ { "TargetID", "target-id", NULL },
{ "ChannelType", "channel-type", NULL },
{ "Interfaces", "interfaces", NULL },
{ NULL }
};
static TpDBusPropertiesMixinPropImpl future_props[] = {
{ "Requested", "requested", NULL },
- { "TargetID", "target-id", NULL },
{ "InitiatorHandle", "initiator-handle", NULL },
{ "InitiatorID", "initiator-id", NULL },
{ NULL }
diff --git a/src/media-channel.c b/src/media-channel.c
index 459c44c..43f50af 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -440,7 +440,7 @@ gabble_media_channel_get_property (GObject *object,
TP_IFACE_CHANNEL, "TargetHandle",
TP_IFACE_CHANNEL, "TargetHandleType",
TP_IFACE_CHANNEL, "ChannelType",
- GABBLE_IFACE_CHANNEL_FUTURE, "TargetID",
+ TP_IFACE_CHANNEL, "TargetID",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorHandle",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorID",
GABBLE_IFACE_CHANNEL_FUTURE, "Requested",
@@ -529,13 +529,13 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c
static TpDBusPropertiesMixinPropImpl channel_props[] = {
{ "TargetHandleType", "handle-type", NULL },
{ "TargetHandle", "handle", NULL },
+ { "TargetID", "target-id", NULL },
{ "ChannelType", "channel-type", NULL },
{ "Interfaces", "interfaces", NULL },
{ NULL }
};
static TpDBusPropertiesMixinPropImpl future_props[] = {
{ "Requested", "requested", NULL },
- { "TargetID", "target-id", NULL },
{ "InitiatorHandle", "creator", NULL },
{ "InitiatorID", "creator-id", NULL },
{ NULL }
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 4b40cdc..c1e64d9 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -856,7 +856,7 @@ gabble_muc_channel_get_property (GObject *object,
TP_IFACE_CHANNEL, "TargetHandle",
TP_IFACE_CHANNEL, "TargetHandleType",
TP_IFACE_CHANNEL, "ChannelType",
- GABBLE_IFACE_CHANNEL_FUTURE, "TargetID",
+ TP_IFACE_CHANNEL, "TargetID",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorHandle",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorID",
GABBLE_IFACE_CHANNEL_FUTURE, "Requested",
@@ -938,13 +938,13 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class)
static TpDBusPropertiesMixinPropImpl channel_props[] = {
{ "TargetHandleType", "handle-type", NULL },
{ "TargetHandle", "handle", NULL },
+ { "TargetID", "target-id", NULL },
{ "ChannelType", "channel-type", NULL },
{ "Interfaces", "interfaces", NULL },
{ NULL }
};
static TpDBusPropertiesMixinPropImpl future_props[] = {
{ "Requested", "requested", NULL },
- { "TargetID", "target-id", NULL },
{ "InitiatorHandle", "initiator-handle", NULL },
{ "InitiatorID", "initiator-id", NULL },
{ NULL }
diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c
index 0a68bd3..f0f757b 100644
--- a/src/roomlist-channel.c
+++ b/src/roomlist-channel.c
@@ -199,7 +199,7 @@ gabble_roomlist_channel_get_property (GObject *object,
TP_IFACE_CHANNEL, "TargetHandle",
TP_IFACE_CHANNEL, "TargetHandleType",
TP_IFACE_CHANNEL, "ChannelType",
- GABBLE_IFACE_CHANNEL_FUTURE, "TargetID",
+ TP_IFACE_CHANNEL, "TargetID",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorHandle",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorID",
GABBLE_IFACE_CHANNEL_FUTURE, "Requested",
@@ -274,6 +274,7 @@ gabble_roomlist_channel_class_init (GabbleRoomlistChannelClass *gabble_roomlist_
static TpDBusPropertiesMixinPropImpl channel_props[] = {
{ "TargetHandleType", "handle-type", NULL },
{ "TargetHandle", "handle", NULL },
+ { "TargetID", "target-id", NULL },
{ "ChannelType", "channel-type", NULL },
{ "Interfaces", "interfaces", NULL },
{ NULL }
@@ -284,7 +285,6 @@ gabble_roomlist_channel_class_init (GabbleRoomlistChannelClass *gabble_roomlist_
};
static TpDBusPropertiesMixinPropImpl future_props[] = {
{ "Requested", "requested", NULL },
- { "TargetID", "target-id", NULL },
{ "InitiatorHandle", "initiator-handle", NULL },
{ "InitiatorID", "initiator-id", NULL },
{ NULL }
diff --git a/src/roster-channel.c b/src/roster-channel.c
index 7b63e8b..962e7a0 100644
--- a/src/roster-channel.c
+++ b/src/roster-channel.c
@@ -252,7 +252,7 @@ gabble_roster_channel_get_property (GObject *object,
TP_IFACE_CHANNEL, "TargetHandle",
TP_IFACE_CHANNEL, "TargetHandleType",
TP_IFACE_CHANNEL, "ChannelType",
- GABBLE_IFACE_CHANNEL_FUTURE, "TargetID",
+ TP_IFACE_CHANNEL, "TargetID",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorHandle",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorID",
GABBLE_IFACE_CHANNEL_FUTURE, "Requested",
@@ -311,13 +311,13 @@ gabble_roster_channel_class_init (GabbleRosterChannelClass *gabble_roster_channe
static TpDBusPropertiesMixinPropImpl channel_props[] = {
{ "TargetHandleType", "handle-type", NULL },
{ "TargetHandle", "handle", NULL },
+ { "TargetID", "target-id", NULL },
{ "ChannelType", "channel-type", NULL },
{ "Interfaces", "interfaces", NULL },
{ NULL }
};
static TpDBusPropertiesMixinPropImpl future_props[] = {
{ "Requested", "requested", NULL },
- { "TargetID", "target-id", NULL },
{ "InitiatorHandle", "initiator-handle", NULL },
{ "InitiatorID", "initiator-id", NULL },
{ NULL }
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 8c9495d..52e4441 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -275,7 +275,7 @@ gabble_tubes_channel_get_property (GObject *object,
TP_IFACE_CHANNEL, "TargetHandle",
TP_IFACE_CHANNEL, "TargetHandleType",
TP_IFACE_CHANNEL, "ChannelType",
- GABBLE_IFACE_CHANNEL_FUTURE, "TargetID",
+ TP_IFACE_CHANNEL, "TargetID",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorHandle",
GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorID",
GABBLE_IFACE_CHANNEL_FUTURE, "Requested",
@@ -2451,13 +2451,13 @@ gabble_tubes_channel_class_init (
static TpDBusPropertiesMixinPropImpl channel_props[] = {
{ "TargetHandleType", "handle-type", NULL },
{ "TargetHandle", "handle", NULL },
+ { "TargetID", "target-id", NULL },
{ "ChannelType", "channel-type", NULL },
{ "Interfaces", "interfaces", NULL },
{ NULL }
};
static TpDBusPropertiesMixinPropImpl future_props[] = {
{ "Requested", "requested", NULL },
- { "TargetID", "target-id", NULL },
{ "InitiatorHandle", "initiator-handle", NULL },
{ "InitiatorID", "initiator-id", NULL },
{ NULL }
diff --git a/tests/twisted/jingle/test-incoming-call-reject.py b/tests/twisted/jingle/test-incoming-call-reject.py
index d9de0a9..127782e 100644
--- a/tests/twisted/jingle/test-incoming-call-reject.py
+++ b/tests/twisted/jingle/test-incoming-call-reject.py
@@ -62,18 +62,18 @@ def test(q, bus, conn, stream):
media_chan = make_channel_proxy(conn, tp_path_prefix + e.path, 'Channel.Interface.Group')
# Exercise channel properties
- future_props = media_chan.GetAll(
+ channel_props = media_chan.GetAll(
'org.freedesktop.Telepathy.Channel',
dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['TargetHandle'] == 0
- assert future_props['TargetHandleType'] == 0
+ assert channel_props['TargetHandle'] == 0
+ assert channel_props['TargetHandleType'] == 0
+ assert channel_props['TargetID'] == ''
# Exercise FUTURE properties
future_props = media_chan.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == False
- assert future_props['TargetID'] == ''
assert future_props['InitiatorID'] == 'foo at bar.com'
assert future_props['InitiatorHandle'] == remote_handle
diff --git a/tests/twisted/jingle/test-outgoing-call-deprecated.py b/tests/twisted/jingle/test-outgoing-call-deprecated.py
index 982535e..cf4f334 100644
--- a/tests/twisted/jingle/test-outgoing-call-deprecated.py
+++ b/tests/twisted/jingle/test-outgoing-call-deprecated.py
@@ -49,12 +49,16 @@ def test(q, bus, conn, stream):
media_iface = make_channel_proxy(conn, path, 'Channel.Type.StreamedMedia')
group_iface = make_channel_proxy(conn, path, 'Channel.Interface.Group')
+ channel_props = group_iface.GetAll(
+ 'org.freedesktop.Telepathy.Channel',
+ dbus_interface='org.freedesktop.DBus.Properties')
+ assert channel_props['TargetID'] == '', channel_props
+
# Exercise FUTURE properties
future_props = group_iface.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == True
- assert future_props['TargetID'] == ''
assert future_props['InitiatorID'] == 'test at localhost'
assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
diff --git a/tests/twisted/jingle/test-outgoing-call-deprecated2.py b/tests/twisted/jingle/test-outgoing-call-deprecated2.py
index 72944a5..41aadcb 100644
--- a/tests/twisted/jingle/test-outgoing-call-deprecated2.py
+++ b/tests/twisted/jingle/test-outgoing-call-deprecated2.py
@@ -49,12 +49,16 @@ def test(q, bus, conn, stream):
media_iface = make_channel_proxy(conn, path, 'Channel.Type.StreamedMedia')
group_iface = make_channel_proxy(conn, path, 'Channel.Interface.Group')
+ channel_props = group_iface.GetAll(
+ 'org.freedesktop.Telepathy.Channel',
+ dbus_interface='org.freedesktop.DBus.Properties')
+ assert channel_props['TargetID'] == '', channel_props
+
# Exercise FUTURE properties
future_props = group_iface.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == True
- assert future_props['TargetID'] == ''
assert future_props['InitiatorID'] == 'test at localhost'
assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
diff --git a/tests/twisted/jingle/test-outgoing-call.py b/tests/twisted/jingle/test-outgoing-call.py
index 2a3e5ae..18b7d03 100644
--- a/tests/twisted/jingle/test-outgoing-call.py
+++ b/tests/twisted/jingle/test-outgoing-call.py
@@ -73,13 +73,13 @@ def test(q, bus, conn, stream):
assert 'org.freedesktop.Telepathy.Channel.Interface.Hold' in \
channel_props.get('Interfaces', ()), \
channel_props.get('Interfaces')
+ assert channel_props['TargetID'] == '', channel_props
# Exercise FUTURE properties
future_props = group_iface.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == True
- assert future_props['TargetID'] == ''
assert future_props['InitiatorID'] == 'test at localhost'
assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
diff --git a/tests/twisted/muc/roomlist.py b/tests/twisted/muc/roomlist.py
index cac5a84..2439bba 100644
--- a/tests/twisted/muc/roomlist.py
+++ b/tests/twisted/muc/roomlist.py
@@ -50,6 +50,7 @@ def test(q, bus, conn, stream):
dbus_interface='org.freedesktop.DBus.Properties')
assert channel_props.get('TargetHandle') == 0,\
channel_props.get('TargetHandle')
+ assert channel_props['TargetID'] == '', channel_props
assert channel_props.get('TargetHandleType') == 0,\
channel_props.get('TargetHandleType')
assert channel_props.get('ChannelType') == \
@@ -64,7 +65,6 @@ def test(q, bus, conn, stream):
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == True
- assert future_props['TargetID'] == ''
assert future_props['InitiatorID'] == 'test at localhost'
assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
diff --git a/tests/twisted/muc/test-muc-invitation.py b/tests/twisted/muc/test-muc-invitation.py
index ff2de5c..c91ce06 100644
--- a/tests/twisted/muc/test-muc-invitation.py
+++ b/tests/twisted/muc/test-muc-invitation.py
@@ -53,12 +53,16 @@ def test(q, bus, conn, stream):
room_self_handle = group_iface.GetSelfHandle()
assert room_self_handle == local_pending[0]
+ channel_props = text_chan.GetAll(
+ 'org.freedesktop.Telepathy.Channel',
+ dbus_interface='org.freedesktop.DBus.Properties')
+ assert channel_props['TargetID'] == 'chat at conf.localhost', channel_props
+
# Exercise FUTURE properties
future_props = text_chan.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == False
- assert future_props['TargetID'] == 'chat at conf.localhost'
assert future_props['InitiatorID'] == 'bob at localhost'
assert future_props['InitiatorHandle'] == bob_handle
diff --git a/tests/twisted/muc/test-muc.py b/tests/twisted/muc/test-muc.py
index 0127b01..02cc2a1 100644
--- a/tests/twisted/muc/test-muc.py
+++ b/tests/twisted/muc/test-muc.py
@@ -92,13 +92,13 @@ def test(q, bus, conn, stream):
assert 'org.freedesktop.Telepathy.Channel.FUTURE' in \
channel_props.get('Interfaces', ()), \
channel_props.get('Interfaces')
+ assert channel_props['TargetID'] == 'chat at conf.localhost', channel_props
# Exercise FUTURE properties
future_props = text_chan.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == True
- assert future_props['TargetID'] == 'chat at conf.localhost'
assert future_props['InitiatorID'] == 'test at localhost'
assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
diff --git a/tests/twisted/roster/groups.py b/tests/twisted/roster/groups.py
index 16d85ee..c9ad6ea 100644
--- a/tests/twisted/roster/groups.py
+++ b/tests/twisted/roster/groups.py
@@ -37,11 +37,15 @@ def _expect_group_channel(q, bus, conn, name, contacts):
inspected = conn.InspectHandles(1, group_iface.GetMembers())
assert inspected == contacts, (inspected, contacts)
+ channel_props = chan.GetAll(
+ 'org.freedesktop.Telepathy.Channel',
+ dbus_interface='org.freedesktop.DBus.Properties')
+ assert channel_props['TargetID'] == name, channel_props
+
future_props = chan.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == False
- assert future_props['TargetID'] == name
assert future_props['InitiatorID'] == ''
assert future_props['InitiatorHandle'] == 0
diff --git a/tests/twisted/roster/test-roster.py b/tests/twisted/roster/test-roster.py
index 020ea43..dde0d16 100644
--- a/tests/twisted/roster/test-roster.py
+++ b/tests/twisted/roster/test-roster.py
@@ -33,13 +33,13 @@ def _expect_contact_list_channel(q, bus, conn, name, contacts):
assert 'org.freedesktop.Telepathy.Channel.Interface.Group' in \
channel_props.get('Interfaces', ()), \
channel_props.get('Interfaces')
+ assert channel_props['TargetID'] == name, channel_props
# Exercise FUTURE properties
future_props = chan.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == False
- assert future_props['TargetID'] == name
assert future_props['InitiatorID'] == ''
assert future_props['InitiatorHandle'] == 0
diff --git a/tests/twisted/text/initiate.py b/tests/twisted/text/initiate.py
index 9cac183..792de03 100644
--- a/tests/twisted/text/initiate.py
+++ b/tests/twisted/text/initiate.py
@@ -55,13 +55,13 @@ def test(q, bus, conn, stream):
assert 'org.freedesktop.Telepathy.Channel.FUTURE' in \
channel_props.get('Interfaces', ()), \
channel_props.get('Interfaces')
+ assert channel_props['TargetID'] == jid,\
+ (channel_props['TargetID'], jid)
future_props = text_chan.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == True
- assert future_props['TargetID'] == jid,\
- (future_props['TargetID'], jid)
assert future_props['InitiatorHandle'] == self_handle,\
(future_props['InitiatorHandle'], self_handle)
assert future_props['InitiatorID'] == 'test at localhost',\
diff --git a/tests/twisted/text/respawn.py b/tests/twisted/text/respawn.py
index e5e5cec..16e6390 100644
--- a/tests/twisted/text/respawn.py
+++ b/tests/twisted/text/respawn.py
@@ -42,12 +42,16 @@ def test(q, bus, conn, stream):
assert sig.args[3] == foo_handle
assert sig.args[4] == True # suppress handler
+ channel_props = text_chan.GetAll(
+ 'org.freedesktop.Telepathy.Channel',
+ dbus_interface='org.freedesktop.DBus.Properties')
+ assert channel_props['TargetID'] == jid,\
+ (channel_props['TargetID'], jid)
+
future_props = text_chan.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == True
- assert future_props['TargetID'] == jid,\
- (future_props['TargetID'], jid)
assert future_props['InitiatorHandle'] == self_handle,\
(future_props['InitiatorHandle'], self_handle)
assert future_props['InitiatorID'] == 'test at localhost',\
@@ -108,12 +112,16 @@ def test(q, bus, conn, stream):
# it now behaves as if the message had initiated it
+ channel_props = text_chan.GetAll(
+ 'org.freedesktop.Telepathy.Channel',
+ dbus_interface='org.freedesktop.DBus.Properties')
+ assert channel_props['TargetID'] == jid,\
+ (channel_props['TargetID'], jid)
+
future_props = text_chan.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == False
- assert future_props['TargetID'] == jid,\
- (future_props['TargetID'], jid)
assert future_props['InitiatorHandle'] == foo_handle,\
(future_props['InitiatorHandle'], foo_handle)
assert future_props['InitiatorID'] == 'foo at bar.com',\
diff --git a/tests/twisted/text/test-text.py b/tests/twisted/text/test-text.py
index 17da0d7..f3a3413 100644
--- a/tests/twisted/text/test-text.py
+++ b/tests/twisted/text/test-text.py
@@ -46,13 +46,13 @@ def test(q, bus, conn, stream):
assert 'org.freedesktop.Telepathy.Channel.FUTURE' in \
channel_props.get('Interfaces', ()), \
channel_props.get('Interfaces')
+ assert channel_props['TargetID'] == jid,\
+ (channel_props['TargetID'], jid)
future_props = text_chan.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == False
- assert future_props['TargetID'] == jid,\
- (future_props['TargetID'], jid)
assert future_props['InitiatorHandle'] == event.args[3],\
(future_props['InitiatorHandle'], event.args[3])
assert future_props['InitiatorID'] == jid,\
diff --git a/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py b/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
index b0815c2..634eeb7 100644
--- a/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
+++ b/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
@@ -126,12 +126,16 @@ def test(q, bus, conn, stream):
tubes_chan = bus.get_object(conn.bus_name, event.args[0])
tubes_iface = dbus.Interface(tubes_chan, event.args[1])
+ channel_props = tubes_chan.GetAll(
+ 'org.freedesktop.Telepathy.Channel',
+ dbus_interface='org.freedesktop.DBus.Properties')
+ assert channel_props['TargetID'] == 'chat at conf.localhost', channel_props
+
# Exercise FUTURE properties
future_props = tubes_chan.GetAll(
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == False
- assert future_props['TargetID'] == 'chat at conf.localhost'
assert future_props['InitiatorID'] == ''
assert future_props['InitiatorHandle'] == 0
diff --git a/tests/twisted/tubes/test-muc-offer-dbus-tube.py b/tests/twisted/tubes/test-muc-offer-dbus-tube.py
index e0cb706..7dfcd11 100644
--- a/tests/twisted/tubes/test-muc-offer-dbus-tube.py
+++ b/tests/twisted/tubes/test-muc-offer-dbus-tube.py
@@ -105,6 +105,7 @@ def test(q, bus, conn, stream):
assert 'org.freedesktop.Telepathy.Channel.Interface.Group' in \
channel_props['Interfaces'], \
channel_props['Interfaces']
+ assert channel_props['TargetID'] == 'chat at conf.localhost', channel_props
# Exercise Group Properties from spec 0.17.6 (in a basic way)
group_props = tubes_chan.GetAll(
@@ -122,7 +123,6 @@ def test(q, bus, conn, stream):
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == True
- assert future_props['TargetID'] == 'chat at conf.localhost'
assert future_props['InitiatorID'] == 'test at localhost'
assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
diff --git a/tests/twisted/tubes/test-si-tubes.py b/tests/twisted/tubes/test-si-tubes.py
index 5253c1b..b3d3a0e 100644
--- a/tests/twisted/tubes/test-si-tubes.py
+++ b/tests/twisted/tubes/test-si-tubes.py
@@ -108,6 +108,7 @@ def test(q, bus, conn, stream):
assert 'org.freedesktop.Telepathy.Channel.Interface.Group' not in \
channel_props['Interfaces'], \
channel_props['Interfaces']
+ assert channel_props['TargetID'] == 'bob at localhost'
self_handle = conn.GetSelfHandle()
@@ -116,7 +117,6 @@ def test(q, bus, conn, stream):
'org.freedesktop.Telepathy.Channel.FUTURE',
dbus_interface='org.freedesktop.DBus.Properties')
assert future_props['Requested'] == True
- assert future_props['TargetID'] == 'bob at localhost'
assert future_props['InitiatorID'] == 'test at localhost'
assert future_props['InitiatorHandle'] == self_handle
--
1.5.6.3
More information about the Telepathy-commits
mailing list