summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-07-02 23:14:01 +0200
committerThomas Haller <thaller@redhat.com>2020-07-02 23:14:01 +0200
commit71642ee140d6364206bc671559d58086fc1884df (patch)
treed72b6a4e5483f953e97b7ddaca6dbd74a4e42314
parent8c8a5a7bec340f74deda5f0e81465ede7608f870 (diff)
downloadNetworkManager-th/cloud-setup-various.tar.gz
-rw-r--r--src/ndisc/tests/test-ndisc-fake.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ndisc/tests/test-ndisc-fake.c b/src/ndisc/tests/test-ndisc-fake.c
index 1054bf0648..f02e5d3ff7 100644
--- a/src/ndisc/tests/test-ndisc-fake.c
+++ b/src/ndisc/tests/test-ndisc-fake.c
@@ -52,6 +52,7 @@ match_gateway (const NMNDiscData *rdata, guint idx, const char *addr, guint32 ts
const NMNDiscData *_rdata = (rdata); \
guint _idx = (idx); \
const NMNDiscAddress *_a; \
+ guint _ts = (ts); \
\
g_assert (_rdata); \
g_assert_cmpint (_idx, <, _rdata->addresses_n); \
@@ -60,7 +61,8 @@ match_gateway (const NMNDiscData *rdata, guint idx, const char *addr, guint32 ts
_a = &_rdata->addresses[_idx]; \
\
nmtst_assert_ip6_address (&_a->address, (addr)); \
- g_assert_cmpint (_a->timestamp, ==, (ts)); \
+ g_assert_cmpint (_a->timestamp, >=, _ts); \
+ g_assert_cmpint (_a->timestamp, <=, _ts + 1); \
g_assert_cmpint (_a->lifetime, ==, (lt)); \
g_assert_cmpint (_a->preferred, ==, (pref)); \
} G_STMT_END
@@ -370,7 +372,7 @@ test_preference_changed_cb (NMNDisc *ndisc, const NMNDiscData *rdata, guint chan
match_gateway (rdata, 0, "fe80::1", data->timestamp1 + 2, 10, NM_ICMPV6_ROUTER_PREF_HIGH);
match_gateway (rdata, 1, "fe80::2", data->timestamp1 + 1, 10, NM_ICMPV6_ROUTER_PREF_MEDIUM);
g_assert_cmpint (rdata->addresses_n, ==, 2);
- match_address (rdata, 0, "2001:db8:a:a::1", data->timestamp1 + 3, 9, 9);
+ match_address (rdata, 0, "2001:db8:a:a::1", data->timestamp1 + 2, 9, 9);
match_address (rdata, 1, "2001:db8:a:b::1", data->timestamp1 + 1, 10, 10);
g_assert_cmpint (rdata->routes_n, ==, 2);
match_route (rdata, 0, "2001:db8:a:a::", 64, "fe80::1", data->timestamp1 + 2, 10, 15);