New upstream version 1.51.90 upstream/1.51.90

3 files changed, 39 insertions, 34 deletions

diff --git a/src/core/tests/config/test-config.c b/src/core/tests/config/test-config.c
index 8365fc82..2980cda7 100644
--- a/src/core/tests/config/test-config.c
+++ b/src/core/tests/config/test-config.c
@@ -965,7 +965,8 @@ _set_values_user_atomic_section_1_set(NMConfig            *config,
     g_key_file_set_string(keyfile, "atomic-prefix-1.section-b", "key1", "user-value1");
     g_key_file_set_string(keyfile, "non-atomic-prefix-1.section-a", "nap1-key1", "user-value1");
     g_key_file_set_string(keyfile, "non-atomic-prefix-1.section-a", "nap1-key2", "user-value2");
-    *out_expected_changes = NM_CONFIG_CHANGE_VALUES | NM_CONFIG_CHANGE_VALUES_USER;
+    *out_expected_changes =
+        NM_CONFIG_CHANGE_VALUES | NM_CONFIG_CHANGE_VALUES_USER | NM_CONFIG_CHANGE_CONFIG_FILES;
 }
 
 static void
@@ -976,7 +977,9 @@ _set_values_user_atomic_section_1_check(NMConfig           *config,
                                         NMConfigData       *old_data)
 {
     if (is_change_event)
-        g_assert(changes == (NM_CONFIG_CHANGE_VALUES | NM_CONFIG_CHANGE_VALUES_USER));
+        g_assert(changes
+                 == (NM_CONFIG_CHANGE_VALUES | NM_CONFIG_CHANGE_VALUES_USER
+                     | NM_CONFIG_CHANGE_CONFIG_FILES));
     assert_config_value(config_data, "atomic-prefix-1.section-a", "key1", "user-value1");
     assert_config_value(config_data, "atomic-prefix-1.section-a", "key2", "user-value2");
     assert_config_value(config_data, "atomic-prefix-1.section-b", "key1", "user-value1");
diff --git a/src/core/tests/test-core.c b/src/core/tests/test-core.c
index 71a3d878..2ff41f00 100644
--- a/src/core/tests/test-core.c
+++ b/src/core/tests/test-core.c
@@ -1027,7 +1027,7 @@ test_connection_match_ip6_routes(void)
 }
 
 #define do_test_wildcard_match_eval(str, ...) \
-    nm_wildcard_match_check(str, (const char *const[]){__VA_ARGS__}, NM_NARG(__VA_ARGS__))
+    nm_wildcard_match_check(str, (const char *const[]) {__VA_ARGS__}, NM_NARG(__VA_ARGS__))
 
 #define do_test_wildcard_match(str, result, ...) \
     g_assert(do_test_wildcard_match_eval(str, __VA_ARGS__) == result)
@@ -1244,7 +1244,7 @@ _test_match_spec_device(const GSList *specs, const char *match_str)
 {
     if (match_str && g_str_has_prefix(match_str, MATCH_S390))
         return nm_match_spec_device(specs,
-                                    &((const NMMatchSpecDeviceData){
+                                    &((const NMMatchSpecDeviceData) {
                                         .s390_subchannels = &match_str[NM_STRLEN(MATCH_S390)],
                                     }));
     if (match_str && g_str_has_prefix(match_str, MATCH_DRIVER)) {
@@ -1257,13 +1257,13 @@ _test_match_spec_device(const GSList *specs, const char *match_str)
             t++;
         }
         return nm_match_spec_device(specs,
-                                    &((const NMMatchSpecDeviceData){
+                                    &((const NMMatchSpecDeviceData) {
                                         .driver         = s,
                                         .driver_version = t,
                                     }));
     }
     return nm_match_spec_device(specs,
-                                &((const NMMatchSpecDeviceData){
+                                &((const NMMatchSpecDeviceData) {
                                     .interface_name = match_str,
                                 }));
 }
@@ -1789,28 +1789,28 @@ test_nm_utils_strbuf_append(void)
     }                                                                        \
     G_STMT_END
 
-#define _strbuf_append_c(buf, len, ch)                             \
-    G_STMT_START                                                   \
-    {                                                              \
-        char **_buf = (buf);                                       \
-        gsize *_len = (len);                                       \
-        char   _ch  = (ch);                                        \
-                                                                   \
-        switch (nmtst_get_rand_uint32() % 4) {                     \
-        case 0:                                                    \
-            nm_strbuf_append(_buf, _len, "%c", _ch);               \
-            break;                                                 \
-        case 1:                                                    \
-            nm_strbuf_append_str(_buf, _len, ((char[2]){_ch, 0})); \
-            break;                                                 \
-        case 2:                                                    \
-            nm_strbuf_append_bin(_buf, _len, &_ch, 1);             \
-            break;                                                 \
-        case 3:                                                    \
-            nm_strbuf_append_c(_buf, _len, _ch);                   \
-            break;                                                 \
-        }                                                          \
-    }                                                              \
+#define _strbuf_append_c(buf, len, ch)                              \
+    G_STMT_START                                                    \
+    {                                                               \
+        char **_buf = (buf);                                        \
+        gsize *_len = (len);                                        \
+        char   _ch  = (ch);                                         \
+                                                                    \
+        switch (nmtst_get_rand_uint32() % 4) {                      \
+        case 0:                                                     \
+            nm_strbuf_append(_buf, _len, "%c", _ch);                \
+            break;                                                  \
+        case 1:                                                     \
+            nm_strbuf_append_str(_buf, _len, ((char[2]) {_ch, 0})); \
+            break;                                                  \
+        case 2:                                                     \
+            nm_strbuf_append_bin(_buf, _len, &_ch, 1);              \
+            break;                                                  \
+        case 3:                                                     \
+            nm_strbuf_append_c(_buf, _len, _ch);                    \
+            break;                                                  \
+        }                                                           \
+    }                                                               \
     G_STMT_END
 
     for (buf_len = 0; buf_len < 10; buf_len++) {
diff --git a/src/core/tests/test-l3cfg.c b/src/core/tests/test-l3cfg.c
index 6b82fe43..6e11ca51 100644
--- a/src/core/tests/test-l3cfg.c
+++ b/src/core/tests/test-l3cfg.c
@@ -111,7 +111,7 @@ _test_fixture_1_teardown(TestFixture1 *f)
     g_object_unref(f->platform);
     nm_dedup_multi_index_unref(f->multiidx);
 
-    *f = (TestFixture1){
+    *f = (TestFixture1) {
         .test_idx = 0,
     };
 }
@@ -192,11 +192,13 @@ _test_l3cfg_signal_notify(NML3Cfg                    *l3cfg,
             nm_assert(NM_IS_L3_CONFIG_DATA(ti->l3cd));
             nm_assert(ti->tag);
         }
-    } else if (notify_data->notify_type == NM_L3_CONFIG_NOTIFY_TYPE_L3CD_CHANGED) {
-        g_assert(!notify_data->l3cd_changed.l3cd_old
-                 || NM_IS_L3_CONFIG_DATA(notify_data->l3cd_changed.l3cd_old));
-        g_assert(!notify_data->l3cd_changed.l3cd_new
-                 || NM_IS_L3_CONFIG_DATA(notify_data->l3cd_changed.l3cd_new));
+    } else if (NM_IN_SET(notify_data->notify_type,
+                         NM_L3_CONFIG_NOTIFY_TYPE_PRE_COMMIT,
+                         NM_L3_CONFIG_NOTIFY_TYPE_POST_COMMIT)) {
+        g_assert(!notify_data->commit.l3cd_old
+                 || NM_IS_L3_CONFIG_DATA(notify_data->commit.l3cd_old));
+        g_assert(!notify_data->commit.l3cd_new
+                 || NM_IS_L3_CONFIG_DATA(notify_data->commit.l3cd_new));
         return;
     }