diff options
| author | Michael Biebl <biebl@debian.org> | 2024-05-05 00:07:42 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-05-05 00:07:42 +0200 |
| commit | a9c892f6640668b93848584d246280c4d33cc025 (patch) | |
| tree | 914226b8c8fffd1a8e101e71d361d6d126322c12 /src/nm-initrd-generator/tests/test-cmdline-reader.c | |
| parent | f03946fe0cdd73041658be1009f06f0e287c4b80 (diff) | |
| parent | 34bb501be08aa2b313d88e67d6e0a7e0a3f9cfa6 (diff) | |
Update upstream source from tag 'upstream/1.47.90'
Update to upstream version '1.47.90' with Debian dir fca683c43690f5e2bfc191d3d528666444bec54b
Diffstat (limited to 'src/nm-initrd-generator/tests/test-cmdline-reader.c')
| -rw-r--r-- | src/nm-initrd-generator/tests/test-cmdline-reader.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c index fd663b6d..1f2141e6 100644 --- a/src/nm-initrd-generator/tests/test-cmdline-reader.c +++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c @@ -1032,7 +1032,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_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1048,7 +1048,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_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1130,7 +1130,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_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1146,7 +1146,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_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1209,7 +1209,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_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1285,7 +1285,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_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1301,7 +1301,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_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1362,7 +1362,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_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1430,7 +1430,7 @@ test_bridge_ip(void) 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_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1494,7 +1494,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_port_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); @@ -1510,7 +1510,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_port_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, master_uuid); g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE); |