Attachment 140011 Details for Bug 106812 – [2/5] server-oom test: Parse the address instead of going directly to TCP

[patch] [2/5] server-oom test: Parse the address instead of going directly to TCP

0002-server-oom-test-Parse-the-address-instead-of-going-d.patch (text/plain), 2.47 KB, created by Simon McVittie on 2018-06-04 15:36:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

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

Size: 2.47 KB

patch

obsolete

>From 272ed7dde2505dc2b05736b9af0021af32e35ee2 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Mon, 4 Jun 2018 16:27:48 +0100
>Subject: [PATCH 2/5] server-oom test: Parse the address instead of going
> directly to TCP
>
>This expands test coverage, and lets us reuse the test for other
>address schemes.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> test/internals/server-oom.c | 32 ++++++++------------------------
> 1 file changed, 8 insertions(+), 24 deletions(-)
>
>diff --git a/test/internals/server-oom.c b/test/internals/server-oom.c
>index f3f48964..84f22b8f 100644
>--- a/test/internals/server-oom.c
>+++ b/test/internals/server-oom.c
>@@ -38,31 +38,15 @@
> /* Return TRUE if the right thing happens, but the right thing might include
>  * OOM. */
> static dbus_bool_t
>-test_new_tcp (void        *user_data,
>-              dbus_bool_t  have_memory)
>+test_new_server (void        *user_data,
>+                 dbus_bool_t  have_memory)
> {
>+  const char *listen_address = user_data;
>   DBusError error = DBUS_ERROR_INIT;
>   DBusServer *server = NULL;
>-  dbus_bool_t use_nonce = FALSE;
>-  const char *bind = "localhost";
>-  const char *family = NULL;
>   dbus_bool_t result = FALSE;
> 
>-  if (user_data != NULL)
>-    {
>-      if (strcmp (user_data, "nonce") == 0)
>-        use_nonce = TRUE;
>-
>-      if (strcmp (user_data, "star") == 0)
>-        bind = "*";
>-
>-      if (strcmp (user_data, "v4") == 0)
>-        family = "ipv4";
>-    }
>-
>-  server = _dbus_server_new_for_tcp_socket ("localhost", bind,
>-                                            "0", family, &error,
>-                                            use_nonce);
>+  server = dbus_server_listen (listen_address, &error);
> 
>   if (server == NULL)
>     goto out;
>@@ -137,10 +121,10 @@ main (int argc,
>   test_init (&argc, &argv);
> 
>   test_cases_to_free = g_queue_new ();
>-  add_oom_test ("/server/new-tcp", test_new_tcp, NULL);
>-  add_oom_test ("/server/new-nonce-tcp", test_new_tcp, "nonce");
>-  add_oom_test ("/server/new-tcp-star", test_new_tcp, "star");
>-  add_oom_test ("/server/new-tcp-v4", test_new_tcp, "v4");
>+  add_oom_test ("/server/new-tcp", test_new_server, "tcp:host=localhost,bind=localhost");
>+  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");
> 
>   ret = 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.