summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2013-11-26 13:38:33 -0500
committerRyan Lortie <desrt@desrt.ca>2013-11-26 13:46:13 -0500
commiteb8f17c4c59ab480007f5ead6949388297b00e74 (patch)
tree3855cdf48da9950274c667e016b8a9daa4548e04 /tests
parent735d95a845ac886355da00f5b0a565bfcaeb9534 (diff)
downloaddconf-eb8f17c4c59ab480007f5ead6949388297b00e74.tar.gz
engine: add 'profile' argument to constructor
Allow specifying a profile when calling dconf_engine_new(). This will allow us to avoid setting/unsetting the DCONF_PROFILE environment in testcases from contexts where other threads may be reading from the environment.
Diffstat (limited to 'tests')
-rw-r--r--tests/engine.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/engine.c b/tests/engine.c
index 8db0f17..abf3000 100644
--- a/tests/engine.c
+++ b/tests/engine.c
@@ -221,7 +221,7 @@ test_signal_threadsafety_worker (gpointer user_data)
{
DConfEngine *engine;
- engine = dconf_engine_new (NULL, NULL);
+ engine = dconf_engine_new (NULL, NULL, NULL);
dconf_engine_unref (engine);
}
@@ -1055,7 +1055,7 @@ test_read (void)
setup_state (n, i, j, (j != k) ? state : NULL);
/* Step 3: create the engine */
- engine = dconf_engine_new (NULL, NULL);
+ engine = dconf_engine_new (NULL, NULL, NULL);
/* Step 4: read, and check result */
check_read (engine, n, i, j);
@@ -1107,7 +1107,7 @@ test_watch_fast (void)
triv = g_variant_ref_sink (g_variant_new ("()"));
g_setenv ("DCONF_PROFILE", SRCDIR "/profile/dos", TRUE);
- engine = dconf_engine_new (NULL, NULL);
+ engine = dconf_engine_new (NULL, NULL, NULL);
g_unsetenv ("DCONF_PROFILE");
/* Check that establishing a watch works properly in the normal case.
@@ -1196,7 +1196,7 @@ test_watch_sync (void)
dconf_mock_dbus_sync_call_handler = handle_match_request;
g_setenv ("DCONF_PROFILE", SRCDIR "/profile/dos", TRUE);
- engine = dconf_engine_new (NULL, NULL);
+ engine = dconf_engine_new (NULL, NULL, NULL);
g_unsetenv ("DCONF_PROFILE");
match_request_type = "AddMatch";
@@ -1246,7 +1246,7 @@ test_change_fast (void)
dconf_changeset_set (slightly_bad_write, "/to-reset", NULL);
g_setenv ("DCONF_PROFILE", SRCDIR "/profile/dos", TRUE);
- engine = dconf_engine_new (NULL, NULL);
+ engine = dconf_engine_new (NULL, NULL, NULL);
g_unsetenv ("DCONF_PROFILE");
success = dconf_engine_change_fast (engine, empty, NULL, &error);
@@ -1426,7 +1426,7 @@ test_change_sync (void)
dconf_changeset_set (slightly_bad_write, "/to-reset", NULL);
g_setenv ("DCONF_PROFILE", SRCDIR "/profile/dos", TRUE);
- engine = dconf_engine_new (NULL, NULL);
+ engine = dconf_engine_new (NULL, NULL, NULL);
g_unsetenv ("DCONF_PROFILE");
success = dconf_engine_change_sync (engine, empty, &tag, &error);