From 84c42aac1b5b59c8c59d9df4a397f45d13abfdbf Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 17 Mar 2016 17:12:30 +0100 Subject: test-nm-client: fix the remaining counter 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. --- libnm/tests/test-nm-client.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'libnm') diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c index 9e9d480eaf..107cc58871 100644 --- a/libnm/tests/test-nm-client.c +++ b/libnm/tests/test-nm-client.c @@ -1002,9 +1002,8 @@ client_devices_changed_cb (GObject *client, g_assert_cmpstr (nm_device_get_iface (device), ==, "eth0.1"); - if (nm_device_get_active_connection (device)) - info->remaining--; - else { + if (!nm_device_get_active_connection (device)) { + info->remaining++; g_signal_connect (device, "notify::" NM_DEVICE_ACTIVE_CONNECTION, G_CALLBACK (device_ac_changed_cb), info); } @@ -1094,8 +1093,10 @@ test_activate_virtual (void) g_signal_connect (client, "notify::" NM_CLIENT_DEVICES, G_CALLBACK (client_devices_changed_cb), &info); - /* As with test_active_connections() above, except that now we're waiting - * for NMClient:devices to change rather than NMDevice:active-connections. + /* We're expecting a client::devices change, client::activate callback, + * 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; -- cgit v1.2.1