Attachment 83791 Details for Bug 67872 – test-message: make the test pass again

[patch] test-message: make the test pass again

0004-test-message-make-the-test-pass-again.patch (text/plain), 2.14 KB, created by Simon McVittie on 2013-08-07 16:25:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-08-07 16:25:07 UTC

Size: 2.14 KB

patch

obsolete

>From 083a7adf49440f1135b149475040d9aa0d805aa7 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 7 Aug 2013 17:08:33 +0100
>Subject: [PATCH 4/6] test-message: make the test pass again
>
>This was wrongly asserting that Text channels only had the Destroyable
>interface, and regressed when we fixed the bug that the Messages
>interface was missing.
>
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> tests/twisted/test-message.py | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/tests/twisted/test-message.py b/tests/twisted/test-message.py
>index 01c401c..0b849a0 100644
>--- a/tests/twisted/test-message.py
>+++ b/tests/twisted/test-message.py
>@@ -1,7 +1,9 @@
> # -*- coding: utf-8 -*-
> 
>-from servicetest import tp_name_prefix, tp_path_prefix, unwrap
>+from servicetest import (tp_name_prefix, tp_path_prefix, unwrap,
>+        assertSameSets)
> from sofiatest import go, exec_test
>+import constants as cs
> 
> import twisted.protocols.sip
> 
>@@ -14,7 +16,6 @@ import uuid
> 
> CHANNEL = tp_name_prefix + '.Channel'
> TEXT_TYPE = tp_name_prefix + '.Channel.Type.Text'
>-DESTROYABLE_IFACE = tp_name_prefix + '.Channel.Interface.Destroyable'
> 
> FROM_URL = 'sip:other.user@somewhere.else.com'
> 
>@@ -30,7 +31,8 @@ def test_new_channel(q, bus, conn, target_uri, initiator_uri, requested):
>             dbus_interface='org.freedesktop.DBus.Properties')
>     assert text_props['ChannelType'] == TEXT_TYPE, text_props
>     assert 'Interfaces' in text_props, text_props
>-    assert text_props['Interfaces'] == [DESTROYABLE_IFACE], text_props
>+    assertSameSets((cs.CHANNEL_IFACE_MESSAGES, cs.CHANNEL_IFACE_DESTROYABLE),
>+            text_props['Interfaces'])
>     assert 'TargetHandle' in text_props, text_props
>     assert text_props['TargetHandle'] == handle, \
>             (text_props, handle)
>@@ -131,7 +133,7 @@ def test(q, bus, conn, sip):
> 
>     conn.ReleaseHandles(1, [handle])
> 
>-    iface = dbus.Interface(incoming_obj, DESTROYABLE_IFACE)
>+    iface = dbus.Interface(incoming_obj, cs.CHANNEL_IFACE_DESTROYABLE)
>     iface.Destroy()
>     del iface
>     event = q.expect('dbus-signal', signal='Closed')
>-- 
>1.8.4.rc1
>

Actions: View | Splinter Review

Attachments on bug 67872: 83788 | 83789 | 83790 | 83791 | 83792 | 83793

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.