test: extend 101-poll and 127-filter tests

diff --git a/test/simulation/101-poll b/test/simulation/101-poll
index 1856a27f959a80eab797018e7bf7037ad61a4193..1416b22825e8ab8480e34b9ae76aca12b985b65e 100755 (executable)
--- a/test/simulation/101-poll
+++ b/test/simulation/101-poll
@@ -27,4 +27,30 @@ for poll in $(seq 1 14); do
        check_sync || test_fail
 done
 
+min_sync_time=$default_min_sync_time
+max_sync_time=$default_max_sync_time
+client_max_min_out_interval=$default_client_max_min_out_interval
+client_min_mean_out_interval=$default_client_min_mean_out_interval
+
+limit=10
+
+for poll in $(seq -7 2 -1); do
+       client_server_options="minpoll $poll maxpoll $poll"
+
+       base_delay=1e-4
+
+       run_test || test_fail
+       check_chronyd_exit || test_fail
+       check_source_selection || test_fail
+       check_file_messages "   2       1       " \
+               $[2**-poll * limit * 9 / 10] $[2**-poll * limit] log.packets || test_fail
+
+       base_delay=2e-2
+
+       run_test || test_fail
+       check_chronyd_exit || test_fail
+       check_source_selection || test_fail
+       check_file_messages "   2       1       " $[limit * 9 / 10] $limit log.packets || test_fail
+done
+
 test_pass

diff --git a/test/simulation/127-filter b/test/simulation/127-filter
index db70d13a2482c1701001b954a656f37653929d83..739dd9156fe695239cbbce8887327ab8eee9d0d2 100755 (executable)
--- a/test/simulation/127-filter
+++ b/test/simulation/127-filter
@@ -4,7 +4,7 @@
 
 test_start "filter option"
 
-client_server_options="minpoll 4 maxpoll 4 filter 15"
+client_server_options="minpoll 4 maxpoll 4 filter 15 maxdelay 3.5e-4"
 min_sync_time=710
 max_sync_time=720
 client_max_min_out_interval=16.1
@@ -16,4 +16,28 @@ check_source_selection || test_fail
 check_packet_interval || test_fail
 check_sync || test_fail
 
+base_delay="(+ 1e-4 (* -1 (equal 0.3 (uniform) 0.0)))"
+client_server_options="minpoll 4 maxpoll 4 filter 3"
+min_sync_time=130
+
+run_test || test_fail
+check_chronyd_exit || test_fail
+check_packet_interval || test_fail
+check_sync || test_fail
+
+limit=10
+client_server_options="minpoll -6 maxpoll -6 filter 1"
+
+base_delay=1e-4
+
+run_test || test_fail
+check_chronyd_exit || test_fail
+check_file_messages "  2       1       " 590 640 log.packets || test_fail
+
+base_delay=2e-2
+
+run_test || test_fail
+check_chronyd_exit || test_fail
+check_file_messages "  2       1       " 9 10 log.packets || test_fail
+
 test_pass