[glib: 3/6] glocalfile: Add test case for g_file_trash
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 3/6] glocalfile: Add test case for g_file_trash
- Date: Sat, 9 Jun 2018 00:29:13 +0000 (UTC)
commit 83ca61a421f71878b927bc10c147f64463b91123
Author: Ondrej Holy <oholy redhat com>
Date: Tue Jun 5 09:09:12 2018 +0200
glocalfile: Add test case for g_file_trash
g_local_file_trash has been changed to return G_IO_ERROR_NOT_SUPPORTED
for locations on system-internal mounts. Let's verify that.
https://gitlab.gnome.org/GNOME/glib/issues/251
gio/tests/Makefile.am | 1 +
gio/tests/meson.build | 1 +
gio/tests/trash.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 105 insertions(+)
---
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 410f11d95..599823893 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -273,6 +273,7 @@ test_programs += \
unix-mounts \
unix-streams \
g-file-info-filesystem-readonly \
+ trash \
$(NULL)
test_extra_programs += \
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 96229bd8b..83fadb6d7 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -123,6 +123,7 @@ if host_machine.system() != 'windows'
'unix-streams',
'g-file-info-filesystem-readonly',
'gschema-compile',
+ 'trash',
]
# Uninstalled because of the check-for-executable logic in DesktopAppInfo
diff --git a/gio/tests/trash.c b/gio/tests/trash.c
new file mode 100644
index 000000000..ec9a9eca6
--- /dev/null
+++ b/gio/tests/trash.c
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2018 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of the
+ * licence, or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib.h>
+
+#ifndef G_OS_UNIX
+#error This is a Unix-specific test
+#endif
+
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+#include <gio/gunixmounts.h>
+
+/* Test that g_file_trash() returns G_IO_ERROR_NOT_SUPPORTED for files on system mounts. */
+static void
+test_trash_not_supported (void)
+{
+ GFile *file;
+ GFileIOStream *stream;
+ GUnixMountEntry *mount;
+ GFileInfo *info;
+ GError *error = NULL;
+ gboolean ret;
+ GStatBuf file_stat, home_stat;
+
+ /* The test assumes that tmp file is located on system internal mount. */
+ file = g_file_new_tmp ("test-trashXXXXXX", &stream, &error);
+ g_assert_no_error (error);
+ g_assert_cmpint (g_lstat (g_file_peek_path (file), &file_stat), ==, 0);
+ g_test_message ("File: %s (dev: %lu)", g_file_peek_path (file), file_stat.st_dev);
+
+ g_assert_cmpint (g_stat (g_get_home_dir (), &home_stat), ==, 0);
+ g_test_message ("Home: %s (dev: %lu)", g_get_home_dir (), home_stat.st_dev);
+
+ if (file_stat.st_dev == home_stat.st_dev)
+ {
+ g_test_skip ("The file has to be on another filesystem than the home trash to run this test");
+
+ g_object_unref (stream);
+ g_object_unref (file);
+
+ return;
+ }
+
+ mount = g_unix_mount_for (g_file_peek_path (file), NULL);
+ g_assert_true (mount == NULL || g_unix_mount_is_system_internal (mount));
+ g_test_message ("Mount: %s", (mount != NULL) ? g_unix_mount_get_mount_path (mount) : "(null)");
+ g_clear_pointer (&mount, g_unix_mount_free);
+
+ /* g_file_trash() shouldn't be supported on system internal mounts,
+ * because those are not monitored by gvfsd-trash.
+ */
+ ret = g_file_trash (file, NULL, &error);
+ g_assert_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED);
+ g_test_message ("Error: %s", error->message);
+ g_assert_false (ret);
+ g_clear_error (&error);
+
+ info = g_file_query_info (file,
+ G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH,
+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+ NULL,
+ &error);
+ g_assert_no_error (error);
+
+ g_assert_false (g_file_info_get_attribute_boolean (info,
+ G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH));
+
+ g_io_stream_close (G_IO_STREAM (stream), NULL, &error);
+ g_assert_no_error (error);
+
+ g_object_unref (info);
+ g_object_unref (stream);
+ g_object_unref (file);
+}
+
+int
+main (int argc, char *argv[])
+{
+ g_test_init (&argc, &argv, NULL);
+
+ g_test_bug_base ("htps://gitlab.gnome.org/GNOME/glib/issues/");
+ g_test_bug ("251");
+
+ g_test_add_func ("/trash/not-supported", test_trash_not_supported);
+
+ return g_test_run ();
+}
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]