picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

sunrpc/tst-udp-*: Fix timeout value

Browse source 
Following on 00c3da43a ('sunrpc/tst-udp-timeout: Fix timeout value').

While e.g. 2.5 timeout can be represented exactly with doubles, time stamps
may not be represented that exactly, and thus with coarse-grain clocks (e.g.
10ms) we may end up with 2.499-ish values due to rounding errors.

* sunrpc/tst-udp-timeout.c (test_udp_server): Add more timeout slack.
* sunrpc/tst-udp-nonblocking.c (do_test): Likewise.
This commit is contained in:
Samuel Thibault 2020-05-16 19:29:50 +02:00
parent 501bdb5dd6
commit cbfc16122e
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sunrpc/tst-udp-nonblocking.c
View file

@ -290,7 +290,7 @@ do_test (void)
printf ("info: send/receive took %f seconds\n",
after_pings - before_pings);
/* Expected timeout is 0.75 seconds. */
TEST_VERIFY (0.75 <= after_pings - before_pings);
TEST_VERIFY (0.70 <= after_pings - before_pings);
TEST_VERIFY (after_pings - before_pings < 1.2);
uint32_t xid;

16
sunrpc/tst-udp-timeout.c
View file

@ -294,10 +294,10 @@ test_udp_server (int port)
double after = get_ticks ();
if (test_verbose)
printf ("info: 21 garbage packets took %f seconds\n", after - before);
/* Expected timeout is 0.5 seconds. Add some slack in case process
scheduling delays processing the query or response, but do not
accept a retry (which would happen at 1.5 seconds). */
TEST_VERIFY (0.5 <= after - before);
/* Expected timeout is 0.5 seconds. Add some slack for rounding errors and
in case process scheduling delays processing the query or response, but
do not accept a retry (which would happen at 1.5 seconds). */
TEST_VERIFY (0.45 <= after - before);
TEST_VERIFY (after - before < 1.2);
test_call_flush (clnt);
@ -316,7 +316,7 @@ test_udp_server (int port)
after - before);
/* Expected timeout is 1.5 seconds. Do not accept a second retry
(which would happen at 3 seconds). */
TEST_VERIFY (1.5 <= after - before);
TEST_VERIFY (1.45 <= after - before);
TEST_VERIFY (after - before < 2.9);
test_call_flush (clnt);
@ -331,7 +331,7 @@ test_udp_server (int port)
if (test_verbose)
printf ("info: 0.75 second timeout took %f seconds\n",
after - before);
TEST_VERIFY (0.75 <= after - before);
TEST_VERIFY (0.70 <= after - before);
TEST_VERIFY (after - before < 1.4);
test_call_flush (clnt);
@ -351,7 +351,7 @@ test_udp_server (int port)
printf ("info: test_udp_server: 0.75 second timeout took %f seconds"
" (garbage %d)\n",
after - before, with_garbage);
TEST_VERIFY (0.75 <= after - before);
TEST_VERIFY (0.70 <= after - before);
TEST_VERIFY (after - before < 1.4);
test_call_flush (clnt);
@ -369,7 +369,7 @@ test_udp_server (int port)
printf ("info: test_udp_server: 2.5 second timeout took %f seconds"
" (garbage %d)\n",
after - before, with_garbage);
TEST_VERIFY (2.5 <= after - before);
TEST_VERIFY (2.45 <= after - before);
TEST_VERIFY (after - before < 3.0);
test_call_flush (clnt);
}