summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2011-11-24 13:14:07 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2011-11-24 13:14:07 +0000
commit7693b5d8176a6af8c1ce937d228049363c40d09f (patch)
tree79ed4bee3ca3dcc7ad7332e7d06d501a7c8421c2
parent266d8346b0b195a9c924cdd3ba1ba3295c9eb8ea (diff)
jingle/outgoing-basics: disregard MembersChangedDetailed flagtelepathy-gabble-0.14.1
In 0.15, 65c8b8f makes this test always expect the Members_Changed_Detailed flag to be present in the channel's group flags. But 0.14 doesn't depend on a new enough telepathy-glib to be sure of that; so here we just mask that flag.
-rw-r--r--tests/twisted/jingle/outgoing-basics.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/twisted/jingle/outgoing-basics.py b/tests/twisted/jingle/outgoing-basics.py
index 15bf6eb77..de8a64d7d 100644
--- a/tests/twisted/jingle/outgoing-basics.py
+++ b/tests/twisted/jingle/outgoing-basics.py
@@ -151,7 +151,13 @@ def worker(jp, q, bus, conn, stream, variant, peer):
expected_flags = base_flags | cs.GF_CAN_ADD
else:
expected_flags = base_flags
- assertEquals(expected_flags, group_props['GroupFlags'])
+
+ # Knock out MembersChangedDetailed flag if it's there. Versions of
+ # telepathy-glib newer than 0.16.2 always set it. We don't really care here
+ # whether it's set or not, so knocking it out of the reported flags makes
+ # this test pass either way.
+ assertEquals(expected_flags,
+ group_props['GroupFlags'] & ~cs.GF_MEMBERS_CHANGED_DETAILED)
assertEquals({}, group_props['HandleOwners'])
assertEquals([], chan.StreamedMedia.ListStreams())