New upstream version 1.34.0 upstream/1.34.0

1 files changed, 8 insertions, 2 deletions

diff --git a/src/core/platform/tests/test-common.c b/src/core/platform/tests/test-common.c
index 2fc9e836..4f56a3a7 100644
--- a/src/core/platform/tests/test-common.c
+++ b/src/core/platform/tests/test-common.c
@@ -37,7 +37,9 @@ gboolean
 nmtstp_is_root_test(void)
 {
     g_assert(_nmtstp_setup_platform_func);
-    return _nmtstp_setup_platform_func == nm_linux_platform_setup;
+    return NM_IN_SET(_nmtstp_setup_platform_func,
+                     nm_linux_platform_setup,
+                     nm_linux_platform_setup_with_tc_cache);
 }
 
 gboolean
@@ -2694,9 +2696,13 @@ _l3_acd_nacd_event(int fd, GIOCondition condition, gpointer user_data)
                   NM_HASH_OBFUSCATE_PTR(defender),
                   NM_ETHER_ADDR_FORMAT_VAL((const NMEtherAddr *) event->defended.sender));
             break;
+        case N_ACD_EVENT_DOWN:
+            /* Not sure why this sometimes happens. But this is only the test stub, ignore it. */
+            _LOGT("acd-defender[" NM_HASH_OBFUSCATE_PTR_FMT "]: link down event received",
+                  NM_HASH_OBFUSCATE_PTR(defender));
+            break;
         case N_ACD_EVENT_USED:
         case N_ACD_EVENT_CONFLICT:
-        case N_ACD_EVENT_DOWN:
         default:
             g_assert_not_reached();
             break;