Attachment 106339 Details for Bug 69702 – test_processid: only assert that it works if we expect it to work

[patch] test_processid: only assert that it works if we expect it to work

0004-test_processid-only-assert-that-it-works-if-we-expec.patch (text/plain), 1.87 KB, created by Simon McVittie on 2014-09-15 17:42:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-09-15 17:42:16 UTC

Size: 1.87 KB

patch

obsolete

>From 6399d0936beac5a3de1ef3eceddab05a24f5cb1d Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 15 Sep 2014 18:38:49 +0100
>Subject: [PATCH 4/4] test_processid: only assert that it works if we expect it
> to work
>
>Otherwise, this would fail on, for instance, QNX.
>---
> test/dbus-daemon.c | 32 ++++++++++++++++++++++----------
> 1 file changed, 22 insertions(+), 10 deletions(-)
>
>diff --git a/test/dbus-daemon.c b/test/dbus-daemon.c
>index 9169d2d..61cfaff 100644
>--- a/test/dbus-daemon.c
>+++ b/test/dbus-daemon.c
>@@ -521,22 +521,34 @@ test_processid (Fixture *f,
>   while (m == NULL)
>     test_main_context_iterate (f->ctx, TRUE);
> 
>-  g_assert_cmpstr (dbus_message_get_signature (m), ==, "u");
>-
>-  g_assert_true (dbus_message_get_args (m, &error,
>-                                        DBUS_TYPE_UINT32, &pid,
>-                                        DBUS_TYPE_INVALID));
>-// g_assert_no_error (&error);
>+  if (dbus_message_get_args (m, &error,
>+        DBUS_TYPE_UINT32, &pid,
>+        DBUS_TYPE_INVALID))
>+    {
>+      g_assert_cmpstr (dbus_message_get_signature (m), ==, "u");
>+      assert_no_error (&error);
> 
>-  g_message ("GetConnectionUnixProcessID returned %u", pid);
>+      g_message ("GetConnectionUnixProcessID returned %u", pid);
> 
> #ifdef G_OS_UNIX
>-  g_assert_cmpuint (pid, ==, getpid ());
>+      g_assert_cmpuint (pid, ==, getpid ());
> #elif defined(G_OS_WIN32)
>-  g_assert_cmpuint (pid, ==, GetCurrentProcessId ());
>+      g_assert_cmpuint (pid, ==, GetCurrentProcessId ());
> #else
>-  g_assert_not_reached ();
>+      g_assert_not_reached ();
> #endif
>+    }
>+  else
>+    {
>+      g_assert_cmpstr (error.name, ==, DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN);
>+
>+#ifdef PID_SHOULD_WORK
>+      g_error ("Expected pid to be passed, but got %s: %s",
>+          error.name, error.message);
>+#endif
>+
>+      dbus_error_free (&error);
>+    }
> }
> 
> static void
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 69702: 97249 | 99398 | 100403 | 102072 | 103645 | 106337 | 106338 | 106339 | 106340 | 108682

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.