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

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

Browse Source 
When the gnome test runner executes the tests, the test appear to execute in disk
order. This means it sometimes works and sometimes we see breakage in portal-support-snap
and portal-support-snap-classic.

The issue is that some tests create config files but some don't. If they run
in the wrong order, tests see config files they shouldn't and break.

Fix this by deleting the files after each test run, properly cleaning up after
themselves. The cleanup code is based upon gtestutils.c:rm_rf().

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2023-05-30 11:52:38 +01:00
parent 49971ee217
commit c63cf19d9a
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
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_snap, g_free);
}

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

@ -67,6 +67,9 @@ tests_teardown (SetupData *setup_data,
else
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_snap, g_free);
}

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

@ -26,6 +26,33 @@
#include <glib.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
create_fake_snapctl (const char *path,
const char *supported_op)

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

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