From ea21882c9a18f2fc422c9090cd262a64cb452ee9 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Mon, 27 Jul 2020 16:09:22 +0200

Subject: [PATCH] test-ndisc-rs: increase timeouts

Timestamp: Mon 2020-07-27 13:50:50 UTC

Monotonic: 985702942708

Hop limit: 64

Flags: <|MANAGED>

Preference: medium

Lifetime: 180

No MTU set

>> Option 3

Valid Lifetime: 500

Preferred Lifetime: 440

Flags: <ONLINK|AUTO>

Prefix Length: 64

Prefix: 2001:db8:dead:beef::

>> Option 25

DNS: 2001:db8:dead:beef::1

Lifetime: 60

>> Option 31

Domain: lab.intra

Lifetime: 60

>> Option 1

Address: 782bcbb36d53

NDISC: Started IPv6 Router Solicitation client

backoff timeout interval  1 3.600s <= 3.987s <= 4.400s

NDISC: Sent Router Solicitation, next solicitation in 3s

backoff timeout interval  2 7.576s <= 8.114s <= 8.374s

NDISC: Sent Router Solicitation, next solicitation in 8s

Assertion 'false' failed at src/libsystemd-network/test-ndisc-rs.c:172, function test_rs_hangcheck(). Aborting.

---

 src/libsystemd-network/test-ndisc-rs.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libsystemd-network/test-ndisc-rs.c b/src/libsystemd-network/test-ndisc-rs.c

index 5d1e66fcdc..1bc3499d07 100644

--- a/src/libsystemd-network/test-ndisc-rs.c

+++ b/src/libsystemd-network/test-ndisc-rs.c

@@ -291,7 +291,7 @@ static void test_rs(void) {

         assert_se(sd_ndisc_set_callback(nd, test_callback, e) >= 0);

         assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(),

-                                 time_now + 2 *USEC_PER_SEC, 0,

+                                 time_now + 30 * USEC_PER_SEC, 0,

                                  test_rs_hangcheck, NULL) >= 0);

         assert_se(sd_ndisc_stop(nd) >= 0);

@@ -393,7 +393,7 @@ static void test_timeout(void) {

         assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0);

         assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(),

-                                 time_now + 2U * USEC_PER_SEC, 0,

+                                 time_now + 30 * USEC_PER_SEC, 0,

                                  test_rs_hangcheck, NULL) >= 0);

         assert_se(sd_ndisc_start(nd) >= 0);