From dfb1c0301ab8c0bd97c485ea2e365e5a12e535d3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 1 Aug 2015 11:17:41 +0200 Subject: [PATCH] platform/tests: fix assertion for test-link for team device Seems that team changed to now also raise two change signals. Relax the assertion that broke tests on Fedora 22. (cherry picked from commit 1c2883c940917e558e604e7ab0eeb1275d24a939) --- src/platform/tests/test-link.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index dc7b83975d..ce371b7524 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -231,10 +231,7 @@ test_slave (int master, int type, SignalData *master_changed) g_assert (nm_platform_link_release (NM_PLATFORM_GET, master, ifindex)); g_assert_cmpint (nm_platform_link_get_master (NM_PLATFORM_GET, ifindex), ==, 0); accept_signals (link_changed, 1, 3); - if (link_type != NM_LINK_TYPE_TEAM) - accept_signals (master_changed, 1, 2); - else - accept_signals (master_changed, 1, 1); + accept_signals (master_changed, 1, 2); ensure_no_signal (master_changed);