Verified Commit 75177f69 authored by Thomas Haller's avatar Thomas Haller

ndisc/tests: relax the assertion in "test-ndisc-fake.c"

  test:ERROR:../src/ndisc/tests/test-ndisc-fake.c:373:test_preference_changed_cb: assertion failed (_a->timestamp == (data->timestamp1 + 3)): (9 == 10)

(cherry picked from commit 8209095e)
parent 0847ede1
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment