about summary refs log tree commit diff
path: root/src/core/settings/plugins/keyfile
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2024-05-05 00:07:42 +0200
committerMichael Biebl <biebl@debian.org>2024-05-05 00:07:42 +0200
commita9c892f6640668b93848584d246280c4d33cc025 (patch)
tree914226b8c8fffd1a8e101e71d361d6d126322c12 /src/core/settings/plugins/keyfile
parentf03946fe0cdd73041658be1009f06f0e287c4b80 (diff)
parent34bb501be08aa2b313d88e67d6e0a7e0a3f9cfa6 (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/core/settings/plugins/keyfile')
-rw-r--r--src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
index b26bad69..e3e5f84f 100644
--- a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
+++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
@@ -91,7 +91,7 @@ assert_reread(NMConnection *connection, gboolean normalize_connection, const cha
     reread = keyfile_read_connection_from_file(testfile);
 
     if (!normalize_connection && (s_con = nm_connection_get_setting_connection(connection))
-        && !nm_setting_connection_get_master(s_con)
+        && !nm_setting_connection_get_controller(s_con)
         && !nm_connection_get_setting_proxy(connection)) {
         connection_clone = nmtst_clone_connection(connection);
         connection       = connection_clone;
@@ -2003,7 +2003,7 @@ test_read_bridge_component(void)
     g_assert(s_con);
     g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, expected_id);
     g_assert_cmpstr(nm_setting_connection_get_uuid(s_con), ==, expected_uuid);
-    g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "br0");
+    g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "br0");
     g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME);
 
     s_wired = nm_connection_get_setting_wired(connection);