Verified Commit 838777a8 authored by Thomas Haller's avatar Thomas Haller

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

First I wanted to fix

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

but that leads to a different failure:

  test:ERROR:../src/ndisc/tests/test-ndisc-fake.c:375:test_preference_changed_cb: assertion failed (_a->lifetime == (9)): (10 == 9)

Instead, the start and end times must match exact (in their duration),
we only allow them to be shifted by up to one second.

Fixes: 8209095e ('ndisc/tests: relax the assertion in "test-ndisc-fake.c"')
(cherry picked from commit b2f03544)
parent 75177f69
Pipeline #171433 passed with stage
in 35 minutes and 28 seconds
......@@ -63,8 +63,8 @@ match_gateway (const NMNDiscData *rdata, guint idx, const char *addr, guint32 ts
nmtst_assert_ip6_address (&_a->address, (addr)); \
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_assert_cmpint (_a->timestamp + _a->lifetime, ==, _ts + (lt)); \
g_assert_cmpint (_a->timestamp + _a->preferred, ==, _ts + (pref)); \
} G_STMT_END
#define match_route(rdata, idx, nw, pl, gw, ts, lt, pref) \
......@@ -372,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 + 2, 9, 9);
match_address (rdata, 0, "2001:db8:a:a::1", data->timestamp1 + 3, 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