about summary refs log tree commit diff
path: root/src/tests/test-ip4-config.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2015-07-14 19:39:12 +0200
committerMichael Biebl <biebl@debian.org>2015-07-14 19:39:12 +0200
commit34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch)
tree1db29ec39d9f733922b3a33cabcc8e6486fa06aa /src/tests/test-ip4-config.c
parent50fc50153b0036516b853aa576dc435bd53ce736 (diff)
parent50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff)
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Diffstat (limited to 'src/tests/test-ip4-config.c')
-rw-r--r--src/tests/test-ip4-config.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c
index 657f7e05..c8bdc75f 100644
--- a/src/tests/test-ip4-config.c
+++ b/src/tests/test-ip4-config.c
@@ -322,11 +322,11 @@ test_merge_subtract_mss_mtu (void)
 	g_assert_cmpuint (nm_ip4_config_get_mtu (cfg1), ==, expected_mtu2);
 
 	nm_ip4_config_merge (cfg1, cfg3);
-	/* ensure again the same MSS and MTU are in cfg1 */
-	g_assert_cmpuint (nm_ip4_config_get_mss (cfg1), ==, expected_mss2);
-	g_assert_cmpuint (nm_ip4_config_get_mtu (cfg1), ==, expected_mtu2);
+	/* ensure again the MSS and MTU in cfg1 got overriden */
+	g_assert_cmpuint (nm_ip4_config_get_mss (cfg1), ==, expected_mss3);
+	g_assert_cmpuint (nm_ip4_config_get_mtu (cfg1), ==, expected_mtu3);
 
-	nm_ip4_config_subtract (cfg1, cfg2);
+	nm_ip4_config_subtract (cfg1, cfg3);
 	/* ensure MSS and MTU are zero in cfg1 */
 	g_assert_cmpuint (nm_ip4_config_get_mss (cfg1), ==, 0);
 	g_assert_cmpuint (nm_ip4_config_get_mtu (cfg1), ==, 0);