proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-07-16 20:27:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Allow overridding the location of the pending database for test suite"

Browse Source 
This reverts commit 5c1999b4ec.
This commit is contained in:
Richard Hughes 2016-04-01 08:38:14 +01:00
parent a9de272370
commit 06c804890a
3 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/fu-pending.c
View File

@ -38,7 +38,6 @@ static void fu_pending_finalize (GObject *object);
**/ **/
typedef struct { typedef struct {
sqlite3 *db; sqlite3 *db;
gchar *pending_dir;
} FuPendingPrivate; } FuPendingPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (FuPending, fu_pending, G_TYPE_OBJECT) G_DEFINE_TYPE_WITH_PRIVATE (FuPending, fu_pending, G_TYPE_OBJECT)
@ -62,14 +61,15 @@ fu_pending_load (FuPending *pending, GError **error)
g_return_val_if_fail (priv->db == NULL, FALSE); g_return_val_if_fail (priv->db == NULL, FALSE);
/* create directory */ /* create directory */
file = g_file_new_for_path (priv->pending_dir); dirname = g_build_filename (LOCALSTATEDIR, "lib", "fwupd", NULL);
file = g_file_new_for_path (dirname);
if (!g_file_query_exists (file, NULL)) { if (!g_file_query_exists (file, NULL)) {
if (!g_file_make_directory_with_parents (file, NULL, error)) if (!g_file_make_directory_with_parents (file, NULL, error))
return FALSE; return FALSE;
} }
/* open */ /* open */
filename = g_build_filename (priv->pending_dir, "pending.db", NULL); filename = g_build_filename (dirname, "pending.db", NULL);
g_debug ("FuPending: trying to open database '%s'", filename); g_debug ("FuPending: trying to open database '%s'", filename);
rc = sqlite3_open (filename, &priv->db); rc = sqlite3_open (filename, &priv->db);
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
@ -512,30 +512,8 @@ fu_pending_class_init (FuPendingClass *klass)
static void static void
fu_pending_init (FuPending *pending) fu_pending_init (FuPending *pending)
{ {
FuPendingPrivate *priv = GET_PRIVATE (pending);
const gchar *tmp;
/* allow this to be overidden for testing */
priv->pending_dir = g_build_filename (LOCALSTATEDIR, "lib", "fwupd", NULL);
tmp = g_getenv ("FWUPD_PENDING_DIR");
if (tmp != NULL)
fu_pending_set_dir (pending, tmp);
} }
/**
* fu_pending_set_dir:
**/
void
fu_pending_set_dir (FuPending *pending, const gchar *pending_dir)
{
FuPendingPrivate *priv = GET_PRIVATE (pending);
g_free (priv->pending_dir);
priv->pending_dir = g_strdup (pending_dir);
g_mkdir_with_parents (pending_dir, 0700);
}
/** /**
* fu_pending_finalize: * fu_pending_finalize:
**/ **/

3
src/fu-pending.h
View File

@ -57,8 +57,7 @@ FwupdResult *fu_pending_get_device (FuPending *pending,
GError **error); GError **error);
GPtrArray *fu_pending_get_devices (FuPending *pending, GPtrArray *fu_pending_get_devices (FuPending *pending,
GError **error); GError **error);
void fu_pending_set_dir (FuPending *pending,
const gchar *pending_dir);
G_END_DECLS G_END_DECLS
#endif /* __FU_PENDING_H */ #endif /* __FU_PENDING_H */

13
src/fu-self-test.c
View File

@ -223,7 +223,6 @@ fu_provider_func (void)
g_assert_cmpint (cnt, ==, 1); g_assert_cmpint (cnt, ==, 1);
/* lets check the pending */ /* lets check the pending */
g_setenv("FWUPD_PENDING_DIR", "/tmp/fwupd-self-test/var/lib/fwupd", FALSE);
pending = fu_pending_new (); pending = fu_pending_new ();
res = fu_pending_get_device (pending, fu_device_get_id (device), &error); res = fu_pending_get_device (pending, fu_device_get_id (device), &error);
g_assert_no_error (error); g_assert_no_error (error);
@ -274,7 +273,7 @@ fu_provider_func (void)
g_clear_error (&error); g_clear_error (&error);
/* delete files */ /* delete files */
pending_db = g_build_filename ("/tmp/fwupd-self-test/var/lib/fwupd", "pending.db", NULL); pending_db = g_build_filename (LOCALSTATEDIR, "lib", "fwupd", "pending.db", NULL);
g_unlink (pending_db); g_unlink (pending_db);
g_unlink (pending_cap); g_unlink (pending_cap);
} }
@ -343,7 +342,7 @@ fu_provider_rpi_func (void)
"20150805"); "20150805");
/* clean up */ /* clean up */
pending_db = g_build_filename ("/tmp/fwupd-self-test/var/lib/fwupd", "pending.db", NULL); pending_db = g_build_filename (LOCALSTATEDIR, "lib", "fwupd", "pending.db", NULL);
g_unlink (pending_db); g_unlink (pending_db);
} }
@ -354,16 +353,18 @@ fu_pending_func (void)
gboolean ret; gboolean ret;
FwupdResult *res; FwupdResult *res;
g_autoptr(FuPending) pending = NULL; g_autoptr(FuPending) pending = NULL;
g_autofree gchar *dirname = NULL;
g_autofree gchar *filename = NULL; g_autofree gchar *filename = NULL;
/* create */ /* create */
g_setenv("FWUPD_PENDING_DIR", "/tmp/fwupd-self-test/var/lib/fwupd", FALSE);
pending = fu_pending_new (); pending = fu_pending_new ();
g_assert (pending != NULL); g_assert (pending != NULL);
/* delete the database */ /* delete the database */
filename = g_build_filename ("/tmp/fwupd-self-test/var/lib/fwupd/", "pending.db", NULL); dirname = g_build_filename (LOCALSTATEDIR, "lib", "fwupd", NULL);
if (!g_file_test (dirname, G_FILE_TEST_IS_DIR))
return;
filename = g_build_filename (dirname, "pending.db", NULL);
g_unlink (filename); g_unlink (filename);
/* add a device */ /* add a device */