luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 12:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix GAction test for headless run

Browse Source
This commit is contained in:
Cosimo Cecchi 2012-03-06 22:10:53 -05:00
parent a06542b998
commit 7cf50ceb85
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gio/tests/Makefile.am
View File

@ -140,6 +140,7 @@ endif
io_stream_SOURCES = io-stream.c io_stream_SOURCES = io-stream.c
io_stream_LDADD = $(progs_ldadd) io_stream_LDADD = $(progs_ldadd)
actions_SOURCES = actions.c gdbus-sessionbus.c gdbus-sessionbus.h
actions_LDADD = $(progs_ldadd) actions_LDADD = $(progs_ldadd)
memory_input_stream_SOURCES = memory-input-stream.c memory_input_stream_SOURCES = memory-input-stream.c

11
gio/tests/actions.c
View File

@ -1,6 +1,8 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <stdlib.h> #include <stdlib.h>
#include "gdbus-sessionbus.h"
typedef struct typedef struct
{ {
GVariant *params; GVariant *params;
@ -536,6 +538,7 @@ test_dbus_export (void)
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);
session_bus_up ();
bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
group = g_simple_action_group_new (); group = g_simple_action_group_new ();
@ -627,6 +630,8 @@ test_dbus_export (void)
g_object_unref (group); g_object_unref (group);
g_main_loop_unref (loop); g_main_loop_unref (loop);
g_object_unref (bus); g_object_unref (bus);
session_bus_down ();
} }
static gpointer static gpointer
@ -683,6 +688,8 @@ test_dbus_threaded (void)
}; };
gint i; gint i;
session_bus_up ();
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
{ {
group[i] = g_simple_action_group_new (); group[i] = g_simple_action_group_new ();
@ -695,6 +702,8 @@ test_dbus_threaded (void)
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
g_object_unref (group[i]); g_object_unref (group[i]);
session_bus_down ();
} }
int int
@ -703,6 +712,8 @@ main (int argc, char **argv)
g_type_init (); g_type_init ();
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_setenv ("DBUS_SESSION_BUS_ADDRESS", session_bus_get_temporary_address (), TRUE);
g_test_add_func ("/actions/basic", test_basic); g_test_add_func ("/actions/basic", test_basic);
g_test_add_func ("/actions/simplegroup", test_simple_group); g_test_add_func ("/actions/simplegroup", test_simple_group);
g_test_add_func ("/actions/stateful", test_stateful); g_test_add_func ("/actions/stateful", test_stateful);