colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test-nm-client: fix the remaining counter

Browse Source 
We're expecting four callbacks: a client::devices change,
client::active-connections change, client::activate callback,
and a device::active-connection change.

We only hook the second one in the callback to the first one, and
only if client::active-connections is not set already. If it is
(when running slowly in valgrind), we just decrement the counter.

However, as the counter is one less than it should be, it would
underflow and we wait forever* instead.

For the value of forever=20s, given that's the timeout of the
mockup service.
This commit is contained in:
Lubomir Rintel
2016-03-17 17:12:30 +01:00
parent 01732b87f6
commit 84c42aac1b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libnm/tests/test-nm-client.c
View File

@@ -1002,9 +1002,8 @@ client_devices_changed_cb (GObject *client,
g_assert_cmpstr (nm_device_get_iface (device), ==, "eth0.1"); g_assert_cmpstr (nm_device_get_iface (device), ==, "eth0.1");
if (nm_device_get_active_connection (device)) if (!nm_device_get_active_connection (device)) {
info->remaining--; info->remaining++;
else {
g_signal_connect (device, "notify::" NM_DEVICE_ACTIVE_CONNECTION, g_signal_connect (device, "notify::" NM_DEVICE_ACTIVE_CONNECTION,
G_CALLBACK (device_ac_changed_cb), info); G_CALLBACK (device_ac_changed_cb), info);
} }
@@ -1094,8 +1093,10 @@ test_activate_virtual (void)
g_signal_connect (client, "notify::" NM_CLIENT_DEVICES, g_signal_connect (client, "notify::" NM_CLIENT_DEVICES,
G_CALLBACK (client_devices_changed_cb), &info); G_CALLBACK (client_devices_changed_cb), &info);
/* As with test_active_connections() above, except that now we're waiting /* We're expecting a client::devices change, client::activate callback,
* for NMClient:devices to change rather than NMDevice:active-connections. * and a device::active-connection change.
* The client::devices callback can hook a client::active-connections
* change and bump this if the property is not yet loaded.
*/ */
info.remaining = 3; info.remaining = 3;