Attachment 141358 Details for Bug 107739 – [6/9] containers test: Exercise GetConnectionInstance() on dbus-daemon itself

[patch] [6/9] containers test: Exercise GetConnectionInstance() on dbus-daemon itself

0006-containers-test-Exercise-GetConnectionInstance-on-db.patch (text/plain), 1.59 KB, created by Simon McVittie on 2018-08-29 18:21:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2018-08-29 18:21:35 UTC

Size: 1.59 KB

patch

obsolete

>From d05dd5ff7f11c04c5706148685f2a5fb109fee73 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Fri, 3 Aug 2018 15:33:08 +0100
>Subject: [PATCH 6/9] containers test: Exercise GetConnectionInstance() on
> dbus-daemon itself
>
>This is an easy bit of missing test coverage detected by running the
>test suite with gcov.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> test/containers.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
>diff --git a/test/containers.c b/test/containers.c
>index 24540051..89898048 100644
>--- a/test/containers.c
>+++ b/test/containers.c
>@@ -1123,6 +1123,22 @@ test_invalid_metadata_getters (Fixture *f,
>   g_free (error_name);
>   g_clear_error (&f->error);
> 
>+  g_test_message ("Inspecting dbus-daemon");
>+  tuple = g_dbus_proxy_call_sync (f->proxy, "GetConnectionInstance",
>+                                  g_variant_new ("(s)", DBUS_SERVICE_DBUS),
>+                                  G_DBUS_CALL_FLAGS_NONE, -1, NULL, &f->error);
>+  g_assert_nonnull (f->error);
>+  g_assert_null (tuple);
>+  error_name = g_dbus_error_get_remote_error (f->error);
>+#ifdef DBUS_ENABLE_CONTAINERS
>+  g_assert_cmpstr (error_name, ==, DBUS_ERROR_NOT_CONTAINER);
>+#else
>+  /* TODO: We can use g_assert_error for this when we depend on GLib 2.42 */
>+  g_assert_cmpstr (error_name, ==, DBUS_ERROR_UNKNOWN_INTERFACE);
>+#endif
>+  g_free (error_name);
>+  g_clear_error (&f->error);
>+
>   g_test_message ("Inspecting a non-connection");
>   unique_name = g_dbus_connection_get_unique_name (f->unconfined_conn);
>   tuple = g_dbus_proxy_call_sync (f->proxy, "GetConnectionInstance",
>-- 
>2.19.0.rc1
>

Actions: View | Splinter Review

Attachments on bug 107739: 141353 | 141354 | 141355 | 141356 | 141357 | 141358 | 141359 | 141360 | 141361

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.