Attachment 75500 Details for Bug 61433 – [0.12 3/6] jingle/outgoing-basics: disregard MembersChangedDetailed flag

[patch] [0.12 3/6] jingle/outgoing-basics: disregard MembersChangedDetailed flag

0003-jingle-outgoing-basics-disregard-MembersChangedDetai.patch (text/plain), 1.50 KB, created by Simon McVittie on 2013-02-25 11:53:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-02-25 11:53:19 UTC

Size: 1.50 KB

patch

obsolete

>From 0d4b3c32127273fa90c634ea373709675d003dfd Mon Sep 17 00:00:00 2001
>From: Will Thompson <will.thompson@collabora.co.uk>
>Date: Thu, 24 Nov 2011 13:14:07 +0000
>Subject: [PATCH 3/6] jingle/outgoing-basics: disregard MembersChangedDetailed
> flag
>
>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.
>---
> tests/twisted/jingle/outgoing-basics.py |    8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/tests/twisted/jingle/outgoing-basics.py b/tests/twisted/jingle/outgoing-basics.py
>index 15bf6eb..de8a64d 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())
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 61433: 75495 | 75496 | 75497 | 75498 | 75499 | 75500 | 75501 | 75502 | 75503

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.