Attachment 140012 Details for Bug 106812 – 3/5] test: Test the same things with unix: that we do with tcp:

[patch] 3/5] test: Test the same things with unix: that we do with tcp:

0003-test-Test-the-same-things-with-unix-that-we-do-with-.patch (text/plain), 4.69 KB, created by Simon McVittie on 2018-06-04 15:36:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2018-06-04 15:36:35 UTC

Size: 4.69 KB

patch

obsolete

>From 00302868bbfd0389cbf89dc31e64c3f7b6d58a2b Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Mon, 4 Jun 2018 16:27:49 +0100
>Subject: [PATCH 3/5] test: Test the same things with unix: that we do with
> tcp:
>
>Minimal autobuilder environments don't always have working TCP,
>so we may need to skip TCP tests. Make sure we test the equivalent
>code paths via Unix sockets in those environments.
>
>One notable exception is test/fdpass.c, which uses TCP as a transport
>that is known not to be able to carry Unix fds; this needs to continue
>to use TCP.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> test/corrupt.c              |  5 +++++
> test/internals/refs.c       |  5 +++++
> test/internals/server-oom.c |  3 +++
> test/loopback.c             |  7 +++++--
> test/relay.c                | 19 ++++++++++++++-----
> 5 files changed, 32 insertions(+), 7 deletions(-)
>
>diff --git a/test/corrupt.c b/test/corrupt.c
>index d6f85021..a2fad64d 100644
>--- a/test/corrupt.c
>+++ b/test/corrupt.c
>@@ -395,5 +395,10 @@ main (int argc,
>   g_test_add ("/corrupt/byte-order/tcp", Fixture, "tcp:host=127.0.0.1", setup,
>       test_byte_order, teardown);
> 
>+#ifdef DBUS_UNIX
>+  g_test_add ("/corrupt/byte-order/unix", Fixture, "unix:tmpdir=/tmp", setup,
>+      test_byte_order, teardown);
>+#endif
>+
>   return g_test_run ();
> }
>diff --git a/test/internals/refs.c b/test/internals/refs.c
>index b749acc9..da2ef725 100644
>--- a/test/internals/refs.c
>+++ b/test/internals/refs.c
>@@ -223,7 +223,12 @@ setup (Fixture *f,
> 
>   dbus_error_init (&f->e);
> 
>+#ifdef DBUS_UNIX
>+  f->server = dbus_server_listen ("unix:tmpdir=/tmp", &f->e);
>+#else
>   f->server = dbus_server_listen ("tcp:host=127.0.0.1", &f->e);
>+#endif
>+
>   assert_no_error (&f->e);
>   g_assert (f->server != NULL);
> 
>diff --git a/test/internals/server-oom.c b/test/internals/server-oom.c
>index 84f22b8f..f9f0a870 100644
>--- a/test/internals/server-oom.c
>+++ b/test/internals/server-oom.c
>@@ -125,6 +125,9 @@ main (int argc,
>   add_oom_test ("/server/new-nonce-tcp", test_new_server, "nonce-tcp:host=localhost,bind=localhost");
>   add_oom_test ("/server/new-tcp-star", test_new_server, "tcp:host=localhost,bind=*");
>   add_oom_test ("/server/new-tcp-v4", test_new_server, "tcp:host=localhost,bind=localhost,family=ipv4");
>+#ifdef DBUS_UNIX
>+  add_oom_test ("/server/unix", test_new_server, "unix:tmpdir=/tmp");
>+#endif
> 
>   ret = g_test_run ();
> 
>diff --git a/test/loopback.c b/test/loopback.c
>index 6a1dbee7..9702fb33 100644
>--- a/test/loopback.c
>+++ b/test/loopback.c
>@@ -467,6 +467,9 @@ main (int argc,
>   g_test_add ("/message/nonce-tcp", Fixture, "nonce-tcp:host=127.0.0.1", setup,
>       test_message, teardown);
> 
>+  g_test_add ("/message/bad-guid/tcp", Fixture, "tcp:host=127.0.0.1", setup,
>+      test_bad_guid, teardown);
>+
> #ifdef DBUS_UNIX
>   g_test_add ("/connect/unix/tmpdir", Fixture, "unix:tmpdir=/tmp", setup,
>       test_connect, teardown);
>@@ -483,10 +486,10 @@ main (int argc,
>   g_test_add ("/connect/unix/no-runtime", Fixture,
>       "unix:runtime=yes;unix:tmpdir=/tmp", setup_no_runtime, test_connect,
>       teardown_no_runtime);
>-#endif
> 
>-  g_test_add ("/message/bad-guid", Fixture, "tcp:host=127.0.0.1", setup,
>+  g_test_add ("/message/bad-guid/unix", Fixture, "unix:tmpdir=/tmp", setup,
>       test_bad_guid, teardown);
>+#endif
> 
>   return g_test_run ();
> }
>diff --git a/test/relay.c b/test/relay.c
>index 00e7966a..5f905460 100644
>--- a/test/relay.c
>+++ b/test/relay.c
>@@ -120,7 +120,7 @@ new_conn_cb (DBusServer *server,
> 
> static void
> setup (Fixture *f,
>-    gconstpointer data G_GNUC_UNUSED)
>+       gconstpointer address)
> {
>   test_timeout_reset (1);
> 
>@@ -128,7 +128,7 @@ setup (Fixture *f,
>   dbus_error_init (&f->e);
>   g_queue_init (&f->messages);
> 
>-  f->server = dbus_server_listen ("tcp:host=127.0.0.1", &f->e);
>+  f->server = dbus_server_listen (address, &f->e);
>   assert_no_error (&f->e);
>   g_assert (f->server != NULL);
> 
>@@ -321,12 +321,21 @@ main (int argc,
> {
>   test_init (&argc, &argv);
> 
>-  g_test_add ("/connect", Fixture, NULL, setup,
>+  g_test_add ("/connect/tcp", Fixture, "tcp:host=127.0.0.1", setup,
>+      test_connect, teardown);
>+  g_test_add ("/relay/tcp", Fixture, "tcp:host=127.0.0.1", setup,
>+      test_relay, teardown);
>+  g_test_add ("/limit/tcp", Fixture, "tcp:host=127.0.0.1", setup,
>+      test_limit, teardown);
>+
>+#ifdef DBUS_UNIX
>+  g_test_add ("/connect/unix", Fixture, "unix:tmpdir=/tmp", setup,
>       test_connect, teardown);
>-  g_test_add ("/relay", Fixture, NULL, setup,
>+  g_test_add ("/relay/unix", Fixture, "unix:tmpdir=/tmp", setup,
>       test_relay, teardown);
>-  g_test_add ("/limit", Fixture, NULL, setup,
>+  g_test_add ("/limit/unix", Fixture, "unix:tmpdir=/tmp", setup,
>       test_limit, teardown);
>+#endif
> 
>   return g_test_run ();
> }
>-- 
>2.17.1
>

Actions: View | Splinter Review

Attachments on bug 106812: 140011 | 140012 | 140013 | 140014

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.