luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-21 08:28:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gdbus-auth-test-timeout' into 'main'

Browse Source 
tests: Various fixes to gdbus-auth, gdbus-non-socket, gdbus-connection-flush, spawn-multithreaded tests

See merge request GNOME/glib!2548
This commit is contained in:
Philip Withnall
2022-03-14 12:52:43 +00:00
parent dbda5a4e38 c455d0efb7
commit 1094144b7a
4 changed files with 82 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gio/tests/gdbus-auth.c
View File

@@ -167,6 +167,7 @@ test_auth_mechanism (const gchar *allowed_client_mechanism,
GMainLoop *loop; GMainLoop *loop;
GThread *client_thread; GThread *client_thread;
TestAuthData data; TestAuthData data;
guint timeout_id;
server = server_new_for_mechanism (allowed_server_mechanism); server = server_new_for_mechanism (allowed_server_mechanism);
@@ -177,7 +178,7 @@ test_auth_mechanism (const gchar *allowed_client_mechanism,
G_CALLBACK (test_auth_on_new_connection), G_CALLBACK (test_auth_on_new_connection),
loop); loop);
g_timeout_add_seconds (5, test_auth_on_timeout, NULL); timeout_id = g_timeout_add_seconds (5, test_auth_on_timeout, NULL);
data.allowed_client_mechanism = allowed_client_mechanism; data.allowed_client_mechanism = allowed_client_mechanism;
data.allowed_server_mechanism = allowed_server_mechanism; data.allowed_server_mechanism = allowed_server_mechanism;
@@ -195,6 +196,7 @@ test_auth_mechanism (const gchar *allowed_client_mechanism,
g_dbus_server_stop (server); g_dbus_server_stop (server);
g_thread_join (client_thread); g_thread_join (client_thread);
g_source_remove (timeout_id);
while (g_main_context_iteration (NULL, FALSE)); while (g_main_context_iteration (NULL, FALSE));
g_main_loop_unref (loop); g_main_loop_unref (loop);

2
gio/tests/gdbus-connection-flush.c
View File

@@ -368,7 +368,7 @@ main (int argc,
{ {
gint ret; gint ret;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add ("/gdbus/connection/flush/busy", Fixture, NULL, g_test_add ("/gdbus/connection/flush/busy", Fixture, NULL,
setup, test_flush_busy, teardown); setup, test_flush_busy, teardown);

2
gio/tests/gdbus-non-socket.c
View File

@@ -293,7 +293,7 @@ main (int argc,
{ {
gint ret; gint ret;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add_func ("/gdbus/non-socket", test_non_socket); g_test_add_func ("/gdbus/non-socket", test_non_socket);

112
glib/tests/spawn-multithreaded.c
View File

@@ -41,8 +41,13 @@ static char *sleep_prog_path;
#include <windows.h> #include <windows.h>
#endif #endif
static GMainLoop *global_main_loop; typedef struct
static guint alive; {
GMainLoop *main_loop;
gint *n_alive; /* (atomic) */
gint ttl; /* seconds */
GMainLoop *thread_main_loop; /* (nullable) */
} SpawnChildsData;
static GPid static GPid
get_a_child (gint ttl) get_a_child (gint ttl)
@@ -84,31 +89,35 @@ get_a_child (gint ttl)
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
} }
static gboolean static void
child_watch_callback (GPid pid, gint status, gpointer data) child_watch_callback (GPid pid, gint status, gpointer user_data)
{ {
gint ttl = GPOINTER_TO_INT (data); SpawnChildsData *data = user_data;
g_test_message ("Child %" G_PID_FORMAT " (ttl %d) exited, status %d", g_test_message ("Child %" G_PID_FORMAT " (ttl %d) exited, status %d",
pid, ttl, status); pid, data->ttl, status);
g_spawn_close_pid (pid); g_spawn_close_pid (pid);
if (--alive == 0) if (g_atomic_int_dec_and_test (data->n_alive))
g_main_loop_quit (global_main_loop); g_main_loop_quit (data->main_loop);
if (data->thread_main_loop != NULL)
return TRUE; g_main_loop_quit (data->thread_main_loop);
} }
static gpointer static gpointer
start_thread (gpointer data) start_thread (gpointer user_data)
{ {
GMainLoop *new_main_loop; GMainLoop *new_main_loop;
GSource *source; GSource *source;
GPid pid; GPid pid;
gint ttl = GPOINTER_TO_INT (data); SpawnChildsData *data = user_data;
gint ttl = data->ttl;
GMainContext *new_main_context = NULL;
new_main_loop = g_main_loop_new (NULL, FALSE); new_main_context = g_main_context_new ();
new_main_loop = g_main_loop_new (new_main_context, FALSE);
data->thread_main_loop = new_main_loop;
pid = get_a_child (ttl); pid = get_a_child (ttl);
source = g_child_watch_source_new (pid); source = g_child_watch_source_new (pid);
@@ -120,6 +129,8 @@ start_thread (gpointer data)
g_test_message ("Created pid: %" G_PID_FORMAT " (ttl %d)", pid, ttl); g_test_message ("Created pid: %" G_PID_FORMAT " (ttl %d)", pid, ttl);
g_main_loop_run (new_main_loop); g_main_loop_run (new_main_loop);
g_main_loop_unref (new_main_loop);
g_main_context_unref (new_main_context);
return NULL; return NULL;
} }
@@ -138,8 +149,12 @@ static void
test_spawn_childs (void) test_spawn_childs (void)
{ {
GPid pid; GPid pid;
GMainLoop *main_loop = NULL;
SpawnChildsData child1_data = { 0, }, child2_data = { 0, };
gint n_alive;
guint timeout_id;
global_main_loop = g_main_loop_new (NULL, FALSE); main_loop = g_main_loop_new (NULL, FALSE);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
system ("cd ."); system ("cd .");
@@ -147,26 +162,42 @@ test_spawn_childs (void)
system ("true"); system ("true");
#endif #endif
alive = 2; n_alive = 2;
g_timeout_add_seconds (30, quit_loop, global_main_loop); timeout_id = g_timeout_add_seconds (30, quit_loop, main_loop);
pid = get_a_child (10); child1_data.main_loop = main_loop;
g_child_watch_add (pid, (GChildWatchFunc) child_watch_callback, child1_data.ttl = 1;
GINT_TO_POINTER (3)); child1_data.n_alive = &n_alive;
pid = get_a_child (20); pid = get_a_child (child1_data.ttl);
g_child_watch_add (pid, (GChildWatchFunc) child_watch_callback, g_child_watch_add (pid,
GINT_TO_POINTER (7)); (GChildWatchFunc) child_watch_callback,
&child1_data);
g_main_loop_run (global_main_loop); child2_data.main_loop = main_loop;
g_main_loop_unref (global_main_loop); child2_data.ttl = 2;
child2_data.n_alive = &n_alive;
pid = get_a_child (child2_data.ttl);
g_child_watch_add (pid,
(GChildWatchFunc) child_watch_callback,
&child2_data);
g_assert_cmpint (alive, ==, 0); g_main_loop_run (main_loop);
g_main_loop_unref (main_loop);
g_source_remove (timeout_id);
g_assert_cmpint (g_atomic_int_get (&n_alive), ==, 0);
} }
static void static void
test_spawn_childs_threads (void) test_spawn_childs_threads (void)
{ {
global_main_loop = g_main_loop_new (NULL, FALSE); GMainLoop *main_loop = NULL;
SpawnChildsData thread1_data = { 0, }, thread2_data = { 0, };
gint n_alive;
guint timeout_id;
GThread *thread1, *thread2;
main_loop = g_main_loop_new (NULL, FALSE);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
system ("cd ."); system ("cd .");
@@ -174,16 +205,27 @@ test_spawn_childs_threads (void)
system ("true"); system ("true");
#endif #endif
alive = 2; n_alive = 2;
g_timeout_add_seconds (30, quit_loop, global_main_loop); timeout_id = g_timeout_add_seconds (30, quit_loop, main_loop);
g_thread_new (NULL, start_thread, GINT_TO_POINTER (3)); thread1_data.main_loop = main_loop;
g_thread_new (NULL, start_thread, GINT_TO_POINTER (7)); thread1_data.n_alive = &n_alive;
thread1_data.ttl = 1; /* seconds */
thread1 = g_thread_new (NULL, start_thread, &thread1_data);
g_main_loop_run (global_main_loop); thread2_data.main_loop = main_loop;
g_main_loop_unref (global_main_loop); thread2_data.n_alive = &n_alive;
thread2_data.ttl = 2; /* seconds */
thread2 = g_thread_new (NULL, start_thread, &thread2_data);
g_assert_cmpint (alive, ==, 0); g_main_loop_run (main_loop);
g_main_loop_unref (main_loop);
g_source_remove (timeout_id);
g_assert_cmpint (g_atomic_int_get (&n_alive), ==, 0);
g_thread_join (g_steal_pointer (&thread2));
g_thread_join (g_steal_pointer (&thread1));
} }
static void static void
@@ -350,8 +392,8 @@ test_spawn_async_multithreaded_instance (gpointer thread_data)
g_main_loop_run (loop); g_main_loop_run (loop);
g_assert (data.child_exited); g_assert_true (data.child_exited);
g_assert (data.stdout_done); g_assert_true (data.stdout_done);
g_assert_cmpstr (data.stdout_buf->str, ==, arg); g_assert_cmpstr (data.stdout_buf->str, ==, arg);
g_string_free (data.stdout_buf, TRUE); g_string_free (data.stdout_buf, TRUE);