Attachment 131831 Details for Bug 101362 – 2/3] test/internals/syslog: Switch to g_test_trap_subprocess()

[patch] 2/3] test/internals/syslog: Switch to g_test_trap_subprocess()

0002-test-internals-syslog-Switch-to-g_test_trap_subproce.patch (text/plain), 3.26 KB, created by Simon McVittie on 2017-06-09 18:18:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-06-09 18:18:40 UTC

Size: 3.26 KB

patch

obsolete

>From c731ebe225aff6b39a458a85b80bbd9c73a24bb0 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Fri, 9 Jun 2017 14:47:39 +0100
>Subject: [PATCH 2/3] test/internals/syslog: Switch to g_test_trap_subprocess()
>
>This re-executes the same binary with special command-line options
>instead of forking. As a result, it can work on Windows, and is less
>dependent on Unix libraries continuing to work across a fork().
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> test/internals/syslog.c | 34 ++++++++++++++--------------------
> 1 file changed, 14 insertions(+), 20 deletions(-)
>
>diff --git a/test/internals/syslog.c b/test/internals/syslog.c
>index cf813fcf..4e0b8b83 100644
>--- a/test/internals/syslog.c
>+++ b/test/internals/syslog.c
>@@ -50,11 +50,10 @@ setup (Fixture *f,
> #define MESSAGE "regression test for _dbus_log(): "
> 
> static void
>-test_syslog (Fixture *f,
>+test_syslog_fatal (Fixture *f,
>     gconstpointer data)
> {
>-#ifndef G_OS_WIN32
>-  if (g_test_trap_fork (0, 0))
>+  if (g_test_subprocess ())
>     {
>       _dbus_init_system_log ("test-syslog",
>           DBUS_LOG_FLAGS_SYSTEM_LOG | DBUS_LOG_FLAGS_STDERR);
>@@ -64,10 +63,16 @@ test_syslog (Fixture *f,
>       exit (0);
>     }
> 
>+  g_test_trap_subprocess (NULL, 0, 0);
>   g_test_trap_assert_failed ();
>   g_test_trap_assert_stderr ("*" MESSAGE "23\n*");
>+}
> 
>-  if (g_test_trap_fork (0, 0))
>+static void
>+test_syslog_normal (Fixture *f,
>+    gconstpointer data)
>+{
>+  if (g_test_subprocess ())
>     {
>       _dbus_init_system_log ("test-syslog",
>           DBUS_LOG_FLAGS_SYSTEM_LOG | DBUS_LOG_FLAGS_STDERR);
>@@ -89,6 +94,7 @@ test_syslog (Fixture *f,
>       exit (0);
>     }
> 
>+  g_test_trap_subprocess (NULL, 0, 0);
>   g_test_trap_assert_passed ();
>   g_test_trap_assert_stderr ("*" MESSAGE "42\n"
>                              "*" MESSAGE "45\n"
>@@ -101,21 +107,6 @@ test_syslog (Fixture *f,
>   g_test_trap_assert_stderr_unmatched ("*this should appear in the syslog "
>                                        "only*");
>   g_test_trap_assert_stderr_unmatched ("*test-syslog-only*");
>-#endif
>-  /* manual test (this is the best we can do on Windows) */
>-  _dbus_init_system_log ("test-syslog",
>-          DBUS_LOG_FLAGS_SYSTEM_LOG | DBUS_LOG_FLAGS_STDERR);
>-  _dbus_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "%d", 42);
>-  _dbus_log (DBUS_SYSTEM_LOG_WARNING, MESSAGE "%d", 45);
>-  _dbus_log (DBUS_SYSTEM_LOG_SECURITY, MESSAGE "%d", 666);
>-
>-  _dbus_init_system_log ("test-syslog-stderr", DBUS_LOG_FLAGS_STDERR);
>-  _dbus_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "this should not appear in the syslog");
>-  _dbus_init_system_log ("test-syslog-both",
>-      DBUS_LOG_FLAGS_SYSTEM_LOG | DBUS_LOG_FLAGS_STDERR);
>-  _dbus_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "this should appear in the syslog and on stderr");
>-  _dbus_init_system_log ("test-syslog-only", DBUS_LOG_FLAGS_SYSTEM_LOG);
>-  _dbus_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "this should appear in the syslog only");
> }
> 
> static void
>@@ -130,7 +121,10 @@ main (int argc,
> {
>   test_init (&argc, &argv);
> 
>-  g_test_add ("/syslog", Fixture, NULL, setup, test_syslog, teardown);
>+  g_test_add ("/syslog/fatal", Fixture, NULL, setup, test_syslog_fatal,
>+              teardown);
>+  g_test_add ("/syslog/normal", Fixture, NULL, setup, test_syslog_normal,
>+              teardown);
> 
>   return g_test_run ();
> }
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 101362: 131830 | 131831 | 131832

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.