[glib: 16/17] tests: Skip g-file-info-filesystem-readonly test if bindfs fails
- From: Sebastian Dröge <sdroege src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 16/17] tests: Skip g-file-info-filesystem-readonly test if bindfs fails
- Date: Mon, 24 Feb 2020 10:02:51 +0000 (UTC)
commit 55eb360c654367b8b87c23537b8cc443ce8c230b
Author: Philip Withnall <withnall endlessm com>
Date: Mon Feb 24 08:33:02 2020 +0000
tests: Skip g-file-info-filesystem-readonly test if bindfs fails
bindfs is part of the setup process, so if it fails (as can happen if
the `fuse` kernel module has not been loaded — not much we can do about
that) then skip the test.
Signed-off-by: Philip Withnall <withnall endlessm com>
gio/tests/g-file-info-filesystem-readonly.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/gio/tests/g-file-info-filesystem-readonly.c b/gio/tests/g-file-info-filesystem-readonly.c
index 60937b143..16fa83e33 100644
--- a/gio/tests/g-file-info-filesystem-readonly.c
+++ b/gio/tests/g-file-info-filesystem-readonly.c
@@ -25,7 +25,7 @@
#include <gio/gio.h>
#include <gio/gunixmounts.h>
-static void
+static gboolean
run (GError **error,
const gchar *argv0,
...)
@@ -34,6 +34,8 @@ run (GError **error,
const gchar *arg;
va_list ap;
GSubprocess *subprocess;
+ gchar *command_line = NULL;
+ gboolean success;
args = g_ptr_array_new ();
@@ -44,14 +46,20 @@ run (GError **error,
g_ptr_array_add (args, NULL);
va_end (ap);
+ command_line = g_strjoinv (" ", (gchar **) args->pdata);
+ g_test_message ("Running command `%s`", command_line);
+ g_free (command_line);
+
subprocess = g_subprocess_newv ((const gchar * const *) args->pdata, G_SUBPROCESS_FLAGS_NONE, error);
g_ptr_array_free (args, TRUE);
if (subprocess == NULL)
- return;
+ return FALSE;
- g_subprocess_wait_check (subprocess, NULL, error);
+ success = g_subprocess_wait_check (subprocess, NULL, error);
g_object_unref (subprocess);
+
+ return success;
}
static void
@@ -135,8 +143,14 @@ test_filesystem_readonly (gconstpointer with_mount_monitor)
/* Use bindfs, which does not need root privileges, to mount the contents of one dir
* into another dir (and do the mount as readonly as per passed '-o ro' option) */
- run (&error, bindfs, "-n", "-o", "ro", dir_to_mount, dir_mountpoint, NULL);
- g_assert_no_error (error);
+ if (!run (&error, bindfs, "-n", "-o", "ro", dir_to_mount, dir_mountpoint, NULL))
+ {
+ gchar *skip_message = g_strdup_printf ("Failed to run bindfs to set up test: %s", error->message);
+ g_test_skip (skip_message);
+ g_free (skip_message);
+ g_clear_error (&error);
+ return;
+ }
/* Let's check now, that the file is in indeed in a readonly filesystem */
file_in_mountpoint = g_strdup_printf ("%s/example.txt", dir_mountpoint);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]