[gom] tests: Use a temporary dir for test-gom-find
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gom] tests: Use a temporary dir for test-gom-find
- Date: Thu, 17 Apr 2014 23:01:07 +0000 (UTC)
commit 9e5f6407486a1417d72962e33484ccf9027aa7b8
Author: Bastien Nocera <hadess hadess net>
Date: Fri Apr 18 00:46:08 2014 +0200
tests: Use a temporary dir for test-gom-find
So that tests don't fail on startup when a failed test happened
beforehand.
tests/test-gom-find.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/tests/test-gom-find.c b/tests/test-gom-find.c
index af6050a..432efa4 100644
--- a/tests/test-gom-find.c
+++ b/tests/test-gom-find.c
@@ -2,6 +2,7 @@
#include <glib/gstdio.h>
static GMainLoop *gMainLoop;
+static char *db_dir_path = NULL;
/* BookmarksResource object */
@@ -220,15 +221,17 @@ close_cb (GObject *object,
gboolean *success = user_data;
gboolean ret;
GError *error = NULL;
- char *path;
+ GFile *file;
ret = gom_adapter_close_finish(adapter, result, &error);
g_assert_no_error(error);
g_assert(ret);
- path = g_build_filename(g_get_tmp_dir (), "gom-db-test.db", NULL);
- g_assert (g_unlink (path) == 0);
- g_free (path);
+ file = g_file_new_for_path(db_dir_path);
+ g_file_trash(file, NULL, NULL);
+ g_object_unref(file);
+
+ g_clear_pointer(&db_dir_path, g_free);
*success = TRUE;
g_main_loop_quit(gMainLoop);
@@ -333,8 +336,12 @@ copy_db (void)
GError *error = NULL;
gboolean ret;
+ db_dir_path = g_dir_make_tmp("test-gom-find-XXXXXXX", &error);
+ g_assert(db_dir_path);
+ g_assert_no_error(error);
+
src = g_file_new_for_commandline_arg (DB);
- path = g_build_filename(g_get_tmp_dir (), "gom-db-test.db", NULL);
+ path = g_build_filename(db_dir_path, "gom-db-test.db", NULL);
dest = g_file_new_for_path (path);
g_free (path);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]