Attachment 59857 Details for Bug 48600 – dbus-tube-chan test: listen on a random address appropriate for the OS

[patch] dbus-tube-chan test: listen on a random address appropriate for the OS

0001-dbus-tube-chan-test-listen-on-a-random-address-appro.patch (text/plain), 1.79 KB, created by Simon McVittie on 2012-04-12 06:02:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-04-12 06:02:20 UTC

Size: 1.79 KB

patch

obsolete

>From 8d50b777a4e4175e58e75e96d485d2433099b930 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 12 Apr 2012 14:01:40 +0100
>Subject: [PATCH] dbus-tube-chan test: listen on a random address appropriate
> for the OS
>
>Instead of hard-coding the abstract Unix socket '\000dbus-tube-test',
>listen on a random (abstract or real) Unix socket in /tmp if on Unix,
>or a random port on 127.0.0.1 if not. These are the same listening
>addresses I used in test/loopback.c in libdbus. The Unix version also
>matches what the session bus normally uses.
>
>This fixes the test on non-Linux Unix (not insisting on
>abstract-namespace sockets working), when run twice in parallel on Linux
>(not insisting on using a particular hard-coded name), and in theory
>also on Windows (not trying to use Unix sockets).
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48600
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> tests/lib/dbus-tube-chan.c |    9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/tests/lib/dbus-tube-chan.c b/tests/lib/dbus-tube-chan.c
>index a1a3fae..835fe63 100644
>--- a/tests/lib/dbus-tube-chan.c
>+++ b/tests/lib/dbus-tube-chan.c
>@@ -18,6 +18,12 @@
> #include <telepathy-glib/gnio-util.h>
> #include <glib/gstdio.h>
> 
>+#if defined(G_OS_UNIX)
>+#   define LISTEN_ADDRESS "unix:tmpdir=/tmp"
>+#else
>+#   define LISTEN_ADDRESS "tcp:host=127.0.0.1"
>+#endif
>+
> enum
> {
>   PROP_SERVICE_NAME = 1,
>@@ -330,8 +336,7 @@ open_tube (TpTestsDBusTubeChannel *self)
> 
>   guid = g_dbus_generate_guid ();
> 
>-  self->priv->dbus_server = g_dbus_server_new_sync (
>-      "unix:abstract=dbus-tube-test",
>+  self->priv->dbus_server = g_dbus_server_new_sync (LISTEN_ADDRESS,
>       G_DBUS_SERVER_FLAGS_NONE, guid, NULL, NULL, &error);
>   g_assert_no_error (error);
> 
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 48600: 59857

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.