From 04aa208e9a03066f64dcffce773de56d95b47a12 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 21 Feb 2021 20:02:29 +0100 Subject: [PATCH] platform/tests: relax unit test for setting IFLA_BR_FORWARD_DELAY/forward_delay https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/665 Fixes: e9278d865947 ('platform/tests: ignore failure for adding bridge with iproute2') (cherry picked from commit 1e81827e6fe61abefeca9fa3f825c7e156744013) --- src/core/platform/tests/test-common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/platform/tests/test-common.c b/src/core/platform/tests/test-common.c index 4a117d59da..1b977145e5 100644 --- a/src/core/platform/tests/test-common.c +++ b/src/core/platform/tests/test-common.c @@ -1542,7 +1542,10 @@ nmtstp_link_bridge_add(NMPlatform * platform, ll = NMP_OBJECT_CAST_LNK_BRIDGE(NMP_OBJECT_UP_CAST(pllink)->_link.netlink.lnk); - g_assert_cmpint(lnk->forward_delay, ==, ll->forward_delay); + /* account for roundtrip rounding error with clock_t_to_jiffies()/jiffies_to_clock_t(). */ + g_assert_cmpint(lnk->forward_delay, >=, ll->forward_delay - 1); + g_assert_cmpint(lnk->forward_delay, <=, ll->forward_delay); + g_assert_cmpint(lnk->hello_time, ==, ll->hello_time); g_assert_cmpint(lnk->max_age, ==, ll->max_age); g_assert_cmpint(lnk->ageing_time, ==, ll->ageing_time);