diff options
| author | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:52 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:52 +0100 |
| commit | b6357ff41de179d0aa2e35a6d574e5749fe09002 (patch) | |
| tree | ff038e98f4569fa3ba217266e6d288410ed84cd4 /src/nm-initrd-generator/tests/test-cmdline-reader.c | |
| parent | 535ecf92edd8ad054ae8102a224c3dd8f3acf967 (diff) | |
| parent | 70e18d99b8e3e77bb37e218d7ac582130156f8ef (diff) | |
Update upstream source from tag 'upstream/1.45.90'
Update to upstream version '1.45.90' with Debian dir d723a85d75b9a8958dee17b97673a3fd9a80e18c
Diffstat (limited to 'src/nm-initrd-generator/tests/test-cmdline-reader.c')
| -rw-r--r-- | src/nm-initrd-generator/tests/test-cmdline-reader.c | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c index 7124d74e..3dbbd4d5 100644 --- a/src/nm-initrd-generator/tests/test-cmdline-reader.c +++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c @@ -1031,7 +1031,7 @@ test_bond(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1047,7 +1047,7 @@ test_bond(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1129,7 +1129,7 @@ test_bond_ip(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1145,7 +1145,7 @@ test_bond_ip(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1208,7 +1208,7 @@ test_bond_default(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1284,9 +1284,7 @@ test_bridge(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), - ==, - NM_SETTING_BRIDGE_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1302,9 +1300,7 @@ test_bridge(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), - ==, - NM_SETTING_BRIDGE_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1365,9 +1361,7 @@ test_bridge_default(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), - ==, - NM_SETTING_BRIDGE_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1433,7 +1427,7 @@ test_bridge_ip(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, ifname); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); @@ -1499,7 +1493,7 @@ test_team(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, @@ -1515,7 +1509,7 @@ test_team(void) ==, NM_SETTING_WIRED_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1"); - g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); + g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, |