summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-08-01 11:17:41 +0200
committerThomas Haller <thaller@redhat.com>2015-08-06 18:06:19 +0200
commitdfb1c0301ab8c0bd97c485ea2e365e5a12e535d3 (patch)
tree67c3b840e96faafa9d25e4dd2e53e4d4fd71c6df
parentbcc94bb989aef3ca32c8898e478b8984791c8c83 (diff)
downloadNetworkManager-dfb1c0301ab8c0bd97c485ea2e365e5a12e535d3.tar.gz
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)
-rw-r--r--src/platform/tests/test-link.c5
1 files changed, 1 insertions, 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);