mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-10-30 11:06:26 +01:00
fd27c8dc6e
This is a spiritual follow-up to commit 8cff531520, which
added `G_TEST_OPTION_ISOLATE_DIRS` to the `gdbus-connection-flush` test
to avoid its D-Bus cookie lock file from being erroneously deleted by
other tests running in parallel.
The same failure mode could affect any of the other D-Bus tests which
connect to a bus. As an easy fix, enable `G_TEST_OPTION_ISOLATE_DIRS`
for all of them.
The only test it’s not (yet) enabled for is `gdbus-address-get-session`
as that messes around with `XDG_RUNTIME_DIR` to test finding the session
bus. It might be possible to use `G_TEST_OPTION_ISOLATE_DIRS` with it,
but that would take longer than I have right now.
In any case, the more tests (which try to connect to a bus) that this is
enabled for, the lower the chances of spurious test failure due to them
conflicting over shared resources.
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
101 lines
3.1 KiB
C
101 lines
3.1 KiB
C
|
|
#include "gdbus-object-manager-example/objectmanager-gen.h"
|
|
|
|
/* ---------------------------------------------------------------------------------------------------- */
|
|
|
|
/* The fixture contains a GTestDBus object and
|
|
* a proxy to the service we're going to be testing.
|
|
*/
|
|
typedef struct {
|
|
GTestDBus *dbus;
|
|
GDBusObjectManager *manager;
|
|
} TestFixture;
|
|
|
|
static void
|
|
fixture_setup (TestFixture *fixture, gconstpointer unused)
|
|
{
|
|
GError *error = NULL;
|
|
gchar *relative, *servicesdir;
|
|
|
|
/* Create the global dbus-daemon for this test suite
|
|
*/
|
|
fixture->dbus = g_test_dbus_new (G_TEST_DBUS_NONE);
|
|
|
|
/* Add the private directory with our in-tree service files.
|
|
*/
|
|
relative = g_test_build_filename (G_TEST_BUILT, "services", NULL);
|
|
servicesdir = g_canonicalize_filename (relative, NULL);
|
|
g_free (relative);
|
|
|
|
g_test_dbus_add_service_dir (fixture->dbus, servicesdir);
|
|
g_free (servicesdir);
|
|
|
|
/* Start the private D-Bus daemon
|
|
*/
|
|
g_test_dbus_up (fixture->dbus);
|
|
|
|
/* Create the proxy that we're going to test
|
|
*/
|
|
fixture->manager =
|
|
example_object_manager_client_new_for_bus_sync (G_BUS_TYPE_SESSION,
|
|
G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
|
|
"org.gtk.GDBus.Examples.ObjectManager",
|
|
"/example/Animals",
|
|
NULL, /* GCancellable */
|
|
&error);
|
|
if (fixture->manager == NULL)
|
|
g_error ("Error getting object manager client: %s", error->message);
|
|
}
|
|
|
|
static void
|
|
fixture_teardown (TestFixture *fixture, gconstpointer unused)
|
|
{
|
|
/* Tear down the proxy
|
|
*/
|
|
if (fixture->manager)
|
|
g_object_unref (fixture->manager);
|
|
|
|
/* Stop the private D-Bus daemon
|
|
*/
|
|
g_test_dbus_down (fixture->dbus);
|
|
g_object_unref (fixture->dbus);
|
|
}
|
|
|
|
/* The gdbus-example-objectmanager-server exports 10 objects,
|
|
* to test the server has actually activated, let's ensure
|
|
* that 10 objects exist.
|
|
*/
|
|
static void
|
|
test_gtest_dbus (TestFixture *fixture, gconstpointer unused)
|
|
{
|
|
GList *objects;
|
|
|
|
objects = g_dbus_object_manager_get_objects (fixture->manager);
|
|
|
|
g_assert_cmpint (g_list_length (objects), ==, 10);
|
|
g_list_free_full (objects, g_object_unref);
|
|
}
|
|
|
|
int
|
|
main (int argc,
|
|
char *argv[])
|
|
{
|
|
g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
|
|
|
|
/* This test simply ensures that we can bring the GTestDBus up and down a hand
|
|
* full of times in a row, each time successfully activating the in-tree service
|
|
*/
|
|
g_test_add ("/GTestDBus/Cycle1", TestFixture, NULL,
|
|
fixture_setup, test_gtest_dbus, fixture_teardown);
|
|
g_test_add ("/GTestDBus/Cycle2", TestFixture, NULL,
|
|
fixture_setup, test_gtest_dbus, fixture_teardown);
|
|
g_test_add ("/GTestDBus/Cycle3", TestFixture, NULL,
|
|
fixture_setup, test_gtest_dbus, fixture_teardown);
|
|
g_test_add ("/GTestDBus/Cycle4", TestFixture, NULL,
|
|
fixture_setup, test_gtest_dbus, fixture_teardown);
|
|
g_test_add ("/GTestDBus/Cycle5", TestFixture, NULL,
|
|
fixture_setup, test_gtest_dbus, fixture_teardown);
|
|
|
|
return g_test_run ();
|
|
}
|