about summary refs log tree commit diff
path: root/src/platform/tests
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2015-08-28 01:14:03 +0200
committerMichael Biebl <biebl@debian.org>2015-08-28 01:14:03 +0200
commit235f4801bff27219c6448c83874b5d9f8686ce58 (patch)
tree7084e0f7d7a63901c21b56b67fbd3e203d5dbb80 /src/platform/tests
parent79436717ed9d593754a40402b6dc1b0cabac605e (diff)
parent81836c2d44802b4cca833d7775dd627e0797a7e2 (diff)
Merge tag 'upstream/1.0.6'
Upstream version 1.0.6
Diffstat (limited to 'src/platform/tests')
-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 dc7b8397..ce371b75 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);