mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-24 08:51:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

More fully reset remote in unit tests

Browse Source 
Don't leave options set on the remote in one of the unit tests. If
something should be set for every test it should be done in
global_setup(). This commit also changes the FlatpakRemote
implementation to allow unsetting title and default branch.
This commit is contained in:
Matthew Leeds
2020-07-16 21:04:26 -07:00
committed by Alexander Larsson
parent de4b497e78
commit b17bf86dee
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common/flatpak-remote.c
View File

@@ -423,7 +423,7 @@ flatpak_remote_get_title (FlatpakRemote *self)
/**
* flatpak_remote_set_title:
* @self: a #FlatpakRemote
* @title: The new title
* @title: The new title, or %NULL to unset
*
* Sets the repository title of this remote.
*
@@ -709,7 +709,7 @@ flatpak_remote_get_default_branch (FlatpakRemote *self)
/**
* flatpak_remote_set_default_branch:
* @self: a #FlatpakRemote
* @default_branch: The new default_branch
* @default_branch: The new default_branch, or %NULL to unset
*
* Sets the default branch configured for this remote.
*
@@ -1181,6 +1181,18 @@ flatpak_remote_commit_filter (FlatpakRemote *self,
return TRUE;
}
static void
_key_file_set_or_unset_string (GKeyFile *config,
const char *group,
const char *key,
const char *value)
{
if (value != NULL)
g_key_file_set_string (config, group, key, value);
else
g_key_file_remove_key (config, group, key, NULL);
}
gboolean
flatpak_remote_commit (FlatpakRemote *self,
FlatpakDir *dir,
@@ -1214,15 +1226,10 @@ flatpak_remote_commit (FlatpakRemote *self,
g_key_file_set_string (config, group, "url", priv->local_url);
if (priv->local_collection_id_set)
{
if (priv->local_collection_id != NULL)
g_key_file_set_string (config, group, "collection-id", priv->local_collection_id);
else
g_key_file_remove_key (config, group, "collection-id", NULL);
}
_key_file_set_or_unset_string (config, group, "collection-id", priv->local_collection_id);
if (priv->local_title_set)
g_key_file_set_string (config, group, "xa.title", priv->local_title);
_key_file_set_or_unset_string (config, group, "xa.title", priv->local_title);
if (priv->local_filter_set)
g_key_file_set_string (config, group, "xa.filter", priv->local_filter ? priv->local_filter : "");
@@ -1240,7 +1247,7 @@ flatpak_remote_commit (FlatpakRemote *self,
g_key_file_set_string (config, group, "xa.icon", priv->local_icon);
if (priv->local_default_branch_set)
g_key_file_set_string (config, group, "xa.default-branch", priv->local_default_branch);
_key_file_set_or_unset_string (config, group, "xa.default-branch", priv->local_default_branch);
if (priv->local_main_ref_set)
g_key_file_set_string (config, group, "xa.main-ref", priv->local_main_ref);

3
tests/testlibrary.c
View File

@@ -701,9 +701,12 @@ test_remote (void)
g_assert_cmpstr (flatpak_remote_get_default_branch (remote), ==, "master");
/* back to defaults */
flatpak_remote_set_title (remote, NULL);
flatpak_remote_set_prio (remote, 1);
flatpak_remote_set_noenumerate (remote, FALSE);
flatpak_remote_set_nodeps (remote, FALSE);
flatpak_remote_set_disabled (remote, FALSE);
flatpak_remote_set_default_branch (remote, NULL);
flatpak_remote_set_gpg_verify (remote, TRUE);
flatpak_remote_set_collection_id (remote, repo_collection_id);