[glib/glib-2-58: 1/3] trash test: Don't assume that ~/.local exists
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-58: 1/3] trash test: Don't assume that ~/.local exists
- Date: Fri, 18 Jan 2019 15:16:29 +0000 (UTC)
commit c792e5adaa8ae3a45e6ff3ff71168ad8d040a0d4
Author: Simon McVittie <smcv collabora com>
Date: Tue Jan 8 12:16:37 2019 +0000
trash test: Don't assume that ~/.local exists
In a minimal autobuilder environment, this test could conceivably be
the first thing to refer to ~/.local.
Modified by Iain Lane <laney debian org>: Don't try to create ~/.local
from tests, but skip if it doesn't exist.
Signed-off-by: Simon McVittie <smcv collabora com>
(cherry picked from commit 56a5cd1337ddcd33223106d7d872b0d1a3fbc7e0)
gio/tests/trash.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/gio/tests/trash.c b/gio/tests/trash.c
index 1055585e5..b7df9363a 100644
--- a/gio/tests/trash.c
+++ b/gio/tests/trash.c
@@ -107,8 +107,19 @@ test_trash_symlinks (void)
g_test_bug ("1522");
- /* The test assumes that ~/.local always exists. */
target = g_build_filename (g_get_home_dir (), ".local", NULL);
+
+ if (!g_file_test (target, G_FILE_TEST_IS_DIR))
+ {
+ gchar *message;
+
+ message = g_strdup_printf ("Directory '%s' does not exist", target);
+ g_test_skip (message);
+ g_free (message);
+ g_free (target);
+ return;
+ }
+
target_mount = g_unix_mount_for (target, NULL);
g_assert_nonnull (target_mount);
g_test_message ("Target: %s (mount: %s)", target, g_unix_mount_get_mount_path (target_mount));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]