luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-03 14:23:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'main'

Browse Source 
gio/tests/portal-support: Fix snap test ordering race

Closes #3020

See merge request GNOME/glib!3454
This commit is contained in:
Philip Withnall 2023-05-30 12:29:06 +00:00
commit ad464d5563
4 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/tests/portal-support-snap-classic.c
View File

@ -66,6 +66,9 @@ tests_teardown (SetupData *setup_data,
else else
g_unsetenv ("SNAP"); g_unsetenv ("SNAP");
cleanup_snapfiles (setup_data->snap_path);
cleanup_snapfiles (setup_data->bin_path);
g_clear_pointer (&setup_data->old_path, g_free); g_clear_pointer (&setup_data->old_path, g_free);
g_clear_pointer (&setup_data->old_snap, g_free); g_clear_pointer (&setup_data->old_snap, g_free);
} }

3
gio/tests/portal-support-snap.c
View File

@ -67,6 +67,9 @@ tests_teardown (SetupData *setup_data,
else else
g_unsetenv ("SNAP"); g_unsetenv ("SNAP");
cleanup_snapfiles (setup_data->snap_path);
cleanup_snapfiles (setup_data->bin_path);
g_clear_pointer (&setup_data->old_path, g_free); g_clear_pointer (&setup_data->old_path, g_free);
g_clear_pointer (&setup_data->old_snap, g_free); g_clear_pointer (&setup_data->old_snap, g_free);
} }

27
gio/tests/portal-support-utils.c
View File

@ -26,6 +26,33 @@
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
void
cleanup_snapfiles (const gchar *path)
{
GDir *dir = NULL;
const gchar *entry;
dir = g_dir_open (path, 0, NULL);
if (dir == NULL)
{
/* Assume it’s a file. Ignore failure. */
(void) g_remove (path);
return;
}
while ((entry = g_dir_read_name (dir)) != NULL)
{
gchar *sub_path = g_build_filename (path, entry, NULL);
cleanup_snapfiles (sub_path);
g_free (sub_path);
}
g_dir_close (dir);
g_rmdir (path);
}
void void
create_fake_snapctl (const char *path, create_fake_snapctl (const char *path,
const char *supported_op) const char *supported_op)

2
gio/tests/portal-support-utils.h
View File

@ -23,6 +23,8 @@
#include <glib.h> #include <glib.h>
void cleanup_snapfiles (const gchar *path);
void create_fake_snap_yaml (const char *snap_path, void create_fake_snap_yaml (const char *snap_path,
gboolean is_classic); gboolean is_classic);