diff options
| author | Francesco Giudici <fgiudici@redhat.com> | 2016-10-07 12:14:26 +0200 |
|---|---|---|
| committer | Francesco Giudici <fgiudici@redhat.com> | 2016-10-07 14:09:50 +0200 |
| commit | 1c7465ff2806cc158e7bb40f58553ece775ece1d (patch) | |
| tree | 6e5800037900b2c91b0fa408e9509e70b235ed9a | |
| parent | e680cf5ffe3c5c92e9c4bc9253bc58433c1e5115 (diff) | |
| download | NetworkManager-fg/nm-1-4-t.tar.gz | |
tempfg/nm-1-4-t
| -rw-r--r-- | src/rdisc/nm-rdisc.h | 2 | ||||
| -rw-r--r-- | src/rdisc/tests/test-rdisc-fake.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rdisc/nm-rdisc.h b/src/rdisc/nm-rdisc.h index 9e5e9349bc..dfd0bf369e 100644 --- a/src/rdisc/nm-rdisc.h +++ b/src/rdisc/nm-rdisc.h @@ -110,7 +110,7 @@ typedef enum { #define NM_RDISC_MAX_ADDRESSES_DEFAULT 16 #define NM_RDISC_ROUTER_SOLICITATIONS_DEFAULT 3 -#define NM_RDISC_ROUTER_SOLICITATION_INTERVAL_DEFAULT 4 +#define NM_RDISC_ROUTER_SOLICITATION_INTERVAL_DEFAULT 15 struct _NMRDiscPrivate; struct _NMRDiscDataInternal; diff --git a/src/rdisc/tests/test-rdisc-fake.c b/src/rdisc/tests/test-rdisc-fake.c index 02ffb5100e..6aebeccea6 100644 --- a/src/rdisc/tests/test-rdisc-fake.c +++ b/src/rdisc/tests/test-rdisc-fake.c @@ -402,7 +402,7 @@ test_dns_solicit_loop_rs_sent (NMFakeRDisc *rdisc, TestData *data) if (data->rs_counter == 1) { data->first_solicit = now; /* Kill the test after 10 seconds if it hasn't failed yet */ - data->timeout_id = g_timeout_add_seconds (10, (GSourceFunc) success_timeout, data); + data->timeout_id = g_timeout_add_seconds (30, (GSourceFunc) success_timeout, data); } /* On all but the first solicitation, which should be triggered by the @@ -411,7 +411,7 @@ test_dns_solicit_loop_rs_sent (NMFakeRDisc *rdisc, TestData *data) */ id = nm_fake_rdisc_add_ra (rdisc, 0, NM_RDISC_DHCP_LEVEL_NONE, 4, 1500); g_assert (id); - nm_fake_rdisc_add_gateway (rdisc, id, "fe80::1", now, 10, NM_RDISC_PREFERENCE_MEDIUM); + nm_fake_rdisc_add_gateway (rdisc, id, "fe80::1", now, 30, NM_RDISC_PREFERENCE_MEDIUM); nm_fake_rdisc_emit_new_ras (rdisc); } else if (data->rs_counter >= 6) { @@ -440,7 +440,7 @@ test_dns_solicit_loop (void) id = nm_fake_rdisc_add_ra (rdisc, 1, NM_RDISC_DHCP_LEVEL_NONE, 4, 1500); g_assert (id); - nm_fake_rdisc_add_gateway (rdisc, id, "fe80::1", now, 10, NM_RDISC_PREFERENCE_LOW); + nm_fake_rdisc_add_gateway (rdisc, id, "fe80::1", now, 30, NM_RDISC_PREFERENCE_LOW); nm_fake_rdisc_add_dns_server (rdisc, id, "2001:db8:c:c::1", now, 6); g_signal_connect (rdisc, |