Attachment 49006 Details for Bug 38997 – test-stream-tube: pass if UNIX sockets are not implemented

[patch] test-stream-tube: pass if UNIX sockets are not implemented

test-stream-tube-pass-if-UNIX-sockets-are-not-impl.patch (text/plain), 3.21 KB, created by Guillaume Desmottes on 2011-07-12 06:22:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2011-07-12 06:22:50 UTC

Size: 3.21 KB

patch

obsolete

>From b01be6c2db65810e0aefdddd41617b0705230971 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Tue, 12 Jul 2011 15:18:40 +0200
>Subject: [PATCH] test-stream-tube: pass if UNIX sockets are not implemented
>
>https://bugs.freedesktop.org/show_bug.cgi?id=38997
>---
> tests/dbus/stream-tube.c |   16 ++++++++++------
> 1 files changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/tests/dbus/stream-tube.c b/tests/dbus/stream-tube.c
>index 76b4f1c..1577b95 100644
>--- a/tests/dbus/stream-tube.c
>+++ b/tests/dbus/stream-tube.c
>@@ -35,16 +35,20 @@ typedef struct {
> } TestContext;
> 
> TestContext contexts[] = {
>+#ifdef HAVE_GIO_UNIX
>   { FALSE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST },
>+  { FALSE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_CREDENTIALS },
>+#endif
>   { FALSE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_LOCALHOST },
>   { FALSE, TP_SOCKET_ADDRESS_TYPE_IPV6, TP_SOCKET_ACCESS_CONTROL_LOCALHOST },
>-  { FALSE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_CREDENTIALS },
>   { FALSE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_PORT },
> 
>+#ifdef HAVE_GIO_UNIX
>   { TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST },
>+  { TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_CREDENTIALS },
>+#endif
>   { TRUE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_LOCALHOST },
>   { TRUE, TP_SOCKET_ADDRESS_TYPE_IPV6, TP_SOCKET_ACCESS_CONTROL_LOCALHOST },
>-  { TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_CREDENTIALS },
>   { TRUE, TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_PORT },
> 
>   { FALSE, NUM_TP_SOCKET_ADDRESS_TYPES, NUM_TP_SOCKET_ACCESS_CONTROLS }
>@@ -629,7 +633,7 @@ static void
> test_accept_twice (Test *test,
>     gconstpointer data G_GNUC_UNUSED)
> {
>-  create_tube_service (test, FALSE, TP_SOCKET_ADDRESS_TYPE_UNIX,
>+  create_tube_service (test, FALSE, TP_SOCKET_ADDRESS_TYPE_IPV4,
>       TP_SOCKET_ACCESS_CONTROL_LOCALHOST, FALSE);
> 
>   tp_stream_tube_channel_accept_async (test->tube, tube_accept_cb, test);
>@@ -650,7 +654,7 @@ test_accept_outgoing (Test *test,
>     gconstpointer data G_GNUC_UNUSED)
> {
>   /* Try to accept an outgoing channel */
>-  create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX,
>+  create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_IPV4,
>       TP_SOCKET_ACCESS_CONTROL_LOCALHOST, FALSE);
> 
>   tp_stream_tube_channel_accept_async (test->tube, tube_accept_cb, test);
>@@ -881,7 +885,7 @@ test_offer_bad_connection_conn_first (Test *test,
>   gchar cm_buffer[BUFFER_SIZE];
> 
>   /* Offer a tube to Bob */
>-  create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX,
>+  create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_IPV4,
>       TP_SOCKET_ACCESS_CONTROL_LOCALHOST, TRUE);
> 
>   tp_stream_tube_channel_offer_async (test->tube, NULL, tube_offer_cb, test);
>@@ -943,7 +947,7 @@ test_offer_bad_connection_sig_first (Test *test,
>   gchar cm_buffer[BUFFER_SIZE];
> 
>   /* Offer a tube to Bob */
>-  create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_UNIX,
>+  create_tube_service (test, TRUE, TP_SOCKET_ADDRESS_TYPE_IPV4,
>       TP_SOCKET_ACCESS_CONTROL_LOCALHOST, TRUE);
> 
>   tp_stream_tube_channel_offer_async (test->tube, NULL, tube_offer_cb, test);
>-- 
>1.7.4.1

Actions: View | Splinter Review

Attachments on bug 38997: 48809 | 48810 | 48811 | 49001 | 49002 | 49003 | 49004 | 49005 | 49006

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.