Attachment 47472 Details for Bug 21937 – DO NOT MERGE: disable introspection for accept-private-stream-tube.py

[patch] DO NOT MERGE: disable introspection for accept-private-stream-tube.py

DO-NOT-MERGE-disable-introspection-for-accept-priv.patch (text/plain), 3.94 KB, created by Will Thompson on 2011-06-03 05:01:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Thompson

Created: 2011-06-03 05:01:06 UTC

Size: 3.94 KB

patch

obsolete

>From 04b3af16ce6862ec8975e1671fe104b5632d0f10 Mon Sep 17 00:00:00 2001
>From: Will Thompson <will.thompson@collabora.co.uk>
>Date: Fri, 3 Jun 2011 12:40:02 +0100
>Subject: [PATCH] DO NOT MERGE: disable introspection for
> accept-private-stream-tube.py
>
>---
> tests/twisted/servicetest.py                      |    4 ++--
> tests/twisted/tubes/accept-private-stream-tube.py |   15 +++++++++------
> 2 files changed, 11 insertions(+), 8 deletions(-)
>
>diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py
>index 976622c..148aac2 100644
>--- a/tests/twisted/servicetest.py
>+++ b/tests/twisted/servicetest.py
>@@ -486,13 +486,13 @@ def make_connection(bus, event_func, name, proto, params):
> 
>     connection_name, connection_path = cm_iface.RequestConnection(
>         proto, dbus.Dictionary(params, signature='sv'))
>-    conn = wrap_connection(bus.get_object(connection_name, connection_path))
>+    conn = wrap_connection(bus.get_object(connection_name, connection_path, introspect=False))
> 
>     return conn
> 
> def make_channel_proxy(conn, path, iface):
>     bus = dbus.SessionBus()
>-    chan = bus.get_object(conn.object.bus_name, path)
>+    chan = bus.get_object(conn.object.bus_name, path, introspect=False)
>     chan = dbus.Interface(chan, tp_name_prefix + '.' + iface)
>     return chan
> 
>diff --git a/tests/twisted/tubes/accept-private-stream-tube.py b/tests/twisted/tubes/accept-private-stream-tube.py
>index 64960a8..c437f49 100644
>--- a/tests/twisted/tubes/accept-private-stream-tube.py
>+++ b/tests/twisted/tubes/accept-private-stream-tube.py
>@@ -65,10 +65,10 @@ def receive_tube_offer(q, bus, conn, stream):
>     assert new_sig.args[0][0][1] is not None
> 
>     # create channel proxies
>-    tubes_chan = bus.get_object(conn.bus_name, chan_path)
>+    tubes_chan = bus.get_object(conn.bus_name, chan_path, introspect=False)
>     tubes_iface = dbus.Interface(tubes_chan, cs.CHANNEL_TYPE_TUBES)
> 
>-    new_tube_chan = bus.get_object(conn.bus_name, new_chan_path)
>+    new_tube_chan = bus.get_object(conn.bus_name, new_chan_path, introspect=False)
>     new_tube_iface = dbus.Interface(new_tube_chan, cs.CHANNEL_TYPE_STREAM_TUBE)
> 
>     return (tubes_chan, tubes_iface, new_tube_chan, new_tube_iface)
>@@ -178,7 +178,7 @@ def test(q, bus, conn, stream, bytestream_cls,
> 
>     # Accept the tube with old iface
>     call_async(q, tubes_iface, 'AcceptStreamTube', stream_tube_id, address_type,
>-        access_control, access_control_param, byte_arrays=True)
>+        access_control, access_control_param, byte_arrays=True, signature='uuuv')
> 
>     accept_return_event, _ = q.expect_many(
>         EventPattern('dbus-return', method='AcceptStreamTube'),
>@@ -199,7 +199,8 @@ def test(q, bus, conn, stream, bytestream_cls,
> 
>     # Accept the tube with old iface, and use UNIX sockets
>     call_async(q, tubes_iface, 'AcceptStreamTube', stream_tube_id,
>-        address_type, access_control, access_control_param, byte_arrays=True)
>+        address_type, access_control, access_control_param, byte_arrays=True,
>+        signature='uuuv')
> 
>     accept_return_event, _ = q.expect_many(
>         EventPattern('dbus-return', method='AcceptStreamTube'),
>@@ -219,7 +220,8 @@ def test(q, bus, conn, stream, bytestream_cls,
> 
>     # Accept the tube with new iface, and use IPv4
>     call_async(q, new_tube_iface, 'Accept', address_type,
>-        access_control, access_control_param, byte_arrays=True)
>+        access_control, access_control_param, byte_arrays=True,
>+        signature='uuv')
> 
>     accept_return_event, _ = q.expect_many(
>         EventPattern('dbus-return', method='Accept'),
>@@ -243,7 +245,8 @@ def test(q, bus, conn, stream, bytestream_cls,
> 
>     # Accept the tube with new iface, and use UNIX sockets
>     call_async(q, new_tube_iface, 'Accept', address_type, access_control,
>-        access_control_param, byte_arrays=True)
>+        access_control_param, byte_arrays=True,
>+        signature='uuv')
> 
>     accept_return_event, _ = q.expect_many(
>         EventPattern('dbus-return', method='Accept'),
>-- 
>1.7.5.3

Actions: View | Splinter Review

Attachments on bug 21937: 47471 | 47472 | 47473

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.