summaryrefslogtreecommitdiff
path: root/libnm/tests
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-10-15 15:27:25 -0400
committerDan Winship <danw@gnome.org>2014-10-22 08:29:09 -0400
commit3be53899faaa11dd0094626acccff72d93872e79 (patch)
tree51de77943c2ebee161cc2373dd7fc1f8f43579d3 /libnm/tests
parent115f8bead84d80f4d2f111c1701e9995c702d60a (diff)
downloadNetworkManager-3be53899faaa11dd0094626acccff72d93872e79.tar.gz
libnm-core, settings: move NMSettingsError to nm-errors
Move the definition of NMSettingsError to nm-errors, register it with D-Bus, and verify in the tests that it maps correctly. Remove a few unused error codes, simplify a few others, and rename GENERAL to FAILED and HOSTNAME_INVALID to INVALID_HOSTNAME, for consistency.
Diffstat (limited to 'libnm/tests')
-rw-r--r--libnm/tests/test-remote-settings-client.c40
1 files changed, 40 insertions, 0 deletions
diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index 643fdf292d..7c3c1222ad 100644
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -458,6 +458,45 @@ test_add_bad_connection (void)
/*******************************************************************/
+static void
+save_hostname_cb (GObject *s,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ gboolean *done = user_data;
+ GError *error = NULL;
+
+ nm_client_save_hostname_finish (client, result, &error);
+ g_assert_no_error (error);
+
+ *done = TRUE;
+}
+
+static void
+test_save_hostname (void)
+{
+ time_t start, now;
+ gboolean done = FALSE;
+ GError *error = NULL;
+
+ /* test-networkmanager-service.py requires the hostname to contain a '.' */
+ nm_client_save_hostname (client, "foo", NULL, &error);
+ g_assert_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_HOSTNAME);
+ g_clear_error (&error);
+
+ nm_client_save_hostname_async (client, "example.com", NULL, save_hostname_cb, &done);
+
+ start = time (NULL);
+ do {
+ now = time (NULL);
+ g_main_context_iteration (NULL, FALSE);
+ } while ((done == FALSE) && (now - start < 5));
+ g_assert (done == TRUE);
+ g_assert (remote == NULL);
+}
+
+/*******************************************************************/
+
int
main (int argc, char **argv)
{
@@ -490,6 +529,7 @@ main (int argc, char **argv)
g_test_add_func ("/client/remove_connection", test_remove_connection);
g_test_add_func ("/client/add_remove_connection", test_add_remove_connection);
g_test_add_func ("/client/add_bad_connection", test_add_bad_connection);
+ g_test_add_func ("/client/save_hostname", test_save_hostname);
ret = g_test_run ();