kbe/calls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

application: Actually test for write ahead log

Browse Source 
While the test was correct and checked if there is only
`record.db` in a given dir (and no other files) it wouldn't
tell us whether the file wasn't there or there were additional
files found. Hence replace the test by assertions that tell
use exactly what failed easing debugging in CI.

Fixes: e4bd4580 ("tests: Add application shutdown tests")
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Part-of: <https://gitlab.gnome.org/GNOME/calls/-/merge_requests/795>
This commit is contained in:
Guido Günther
2025-10-13 10:11:06 +02:00
parent 85b65d030d
commit 8f6b8bc6b9
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
tests/test-application.c
View File

@@ -11,6 +11,29 @@
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <glib.h> #include <glib.h>
#define calls_assert_in_dir(file, dir) G_STMT_START { \
g_autofree char *__p = g_build_path ("/", dir, file, NULL); \
g_autoptr (GFile) __f = g_file_new_for_path (__p); \
if (!g_file_query_exists (__f, NULL)) { \
g_autofree char *__msg = \
g_strdup_printf ("File %s does not exist", __p); \
g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, __msg); \
} \
} G_STMT_END
#define calls_assert_not_in_dir(file, dir) G_STMT_START { \
g_autofree char *__p = g_build_path ("/", dir, file, NULL); \
g_autoptr (GFile) __f = g_file_new_for_path (__p); \
if (g_file_query_exists (__f, NULL)) { \
g_autofree char *__msg = \
g_strdup_printf ("File %s must not exist", __p); \
g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, __msg); \
} \
} G_STMT_END
static gboolean static gboolean
on_idle_quit (gpointer user_data) on_idle_quit (gpointer user_data)
{ {
@@ -96,29 +119,6 @@ test_application_shutdown_sigterm (void)
} }
static gboolean
dir_contains (const char *dir,
const char *file,
gboolean only_file)
{
g_autoptr (GDir) tmp_dir = g_dir_open (dir, 0, NULL);
const char *tmp_file;
gboolean found = FALSE;
uint n = 0;
while ((tmp_file = g_dir_read_name (tmp_dir))) {
if (g_strcmp0 (tmp_file, file) == 0)
found = TRUE;
n++;
}
if (only_file)
return found && n == 1;
return found;
}
int int
main (int argc, main (int argc,
char *argv[]) char *argv[])
@@ -143,8 +143,10 @@ main (int argc,
status = g_test_run (); status = g_test_run ();
/* assert there is no dangling write-ahead-log */ /* Check that sqlite db is there but no stale write ahead logs */
g_assert_true (dir_contains (rec_dir, "records.db", TRUE)); calls_assert_in_dir ("records.db", rec_dir);
calls_assert_not_in_dir ("records.db-wal", rec_dir);
calls_assert_not_in_dir ("records.db-shm", rec_dir);
g_rmdir (rec_dir); g_rmdir (rec_dir);