From 71e55e0f6cb1c949656441ee4f90585590efc68f Mon Sep 17 00:00:00 2001 From: David Barth Date: Tue, 22 Sep 2015 09:40:12 +0200 Subject: ensure that the availability of a server gets signaled, even in the absence of an exec line --- tests/server-test.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/server-test.c b/tests/server-test.c index 06b6233..f5e50c7 100644 --- a/tests/server-test.c +++ b/tests/server-test.c @@ -37,27 +37,29 @@ test_update_signal (void) Server * server = NULL; server = server_new_from_keyfile(keyfile, groupname); g_assert(server != NULL); - g_assert(g_strcmp0(server->name, "My Server") == 0); - g_assert(g_strcmp0(server->uri, "http://my.domain.com") == 0); UccsServer * userver = UCCS_SERVER(server); g_assert(userver != NULL); gboolean signaled = FALSE; g_signal_connect(G_OBJECT(server), SERVER_SIGNAL_STATE_CHANGED, G_CALLBACK(state_signal), &signaled); - - if (server->state == SERVER_STATE_ALLGOOD) { - signaled = FALSE; - uccs_server_set_exec(userver, "thisshouldnotexist"); - g_assert(signaled); - g_assert(server->state == SERVER_STATE_UNAVAILABLE); - } + server->state = SERVER_STATE_UNAVAILABLE; signaled = FALSE; - uccs_server_set_exec(userver, "ls"); + uccs_notify_state_change(userver); + /* a change from available to good is notified */ g_assert(signaled); g_assert(server->state == SERVER_STATE_ALLGOOD); + signaled = FALSE; + server->state = SERVER_STATE_ALLGOOD; + userver->last_network = NM_STATE_DISCONNECTED; + userver->min_network = NM_STATE_CONNECTED_GLOBAL; + uccs_notify_state_change(userver); + /* if the server becomes unavailable, it is notified as well */ + g_assert(signaled); + g_assert(server->state == SERVER_STATE_UNAVAILABLE); + return; } -- cgit v1.2.3