diff options
| author | David Goulet <dgoulet@torproject.org> | 2017-09-14 13:23:43 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2017-09-15 11:40:59 -0400 |
| commit | 7cc9621d115303ab71d8cf8e49f5dfe428636145 (patch) | |
| tree | db1904c51fdf33bb7184c4c20c413045898e98b4 /src/test/test_scheduler.c | |
| parent | 6ff8c86ac663914901b4ea9ce64c20b59bec6011 (diff) | |
| download | tor-7cc9621d115303ab71d8cf8e49f5dfe428636145.tar.gz tor-7cc9621d115303ab71d8cf8e49f5dfe428636145.zip | |
sched: Add Schedulers torrc option
This option is a list of possible scheduler type tor can use ordered by
priority. Its default value is "KIST,KISTLite,Vanilla" which means that KIST
will be used first and if unavailable will fallback to KISTLite and so on.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/test/test_scheduler.c')
| -rw-r--r-- | src/test/test_scheduler.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index 7c24bf1465..0cc6d88dbb 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -887,7 +887,7 @@ test_scheduler_initfree(void *arg) } static void -test_scheduler_should_use_kist(void *arg) +test_scheduler_can_use_kist(void *arg) { (void)arg; @@ -897,7 +897,7 @@ test_scheduler_should_use_kist(void *arg) /* Test force disabling of KIST */ clear_options(); mocked_options.KISTSchedRunInterval = -1; - res_should = scheduler_should_use_kist(); + res_should = scheduler_can_use_kist(); res_freq = kist_scheduler_run_interval(NULL); tt_int_op(res_should, ==, 0); tt_int_op(res_freq, ==, -1); @@ -905,7 +905,7 @@ test_scheduler_should_use_kist(void *arg) /* Test force enabling of KIST */ clear_options(); mocked_options.KISTSchedRunInterval = 1234; - res_should = scheduler_should_use_kist(); + res_should = scheduler_can_use_kist(); res_freq = kist_scheduler_run_interval(NULL); #ifdef HAVE_KIST_SUPPORT tt_int_op(res_should, ==, 1); @@ -917,7 +917,7 @@ test_scheduler_should_use_kist(void *arg) /* Test defer to consensus, but no consensus available */ clear_options(); mocked_options.KISTSchedRunInterval = 0; - res_should = scheduler_should_use_kist(); + res_should = scheduler_can_use_kist(); res_freq = kist_scheduler_run_interval(NULL); #ifdef HAVE_KIST_SUPPORT tt_int_op(res_should, ==, 1); @@ -930,7 +930,7 @@ test_scheduler_should_use_kist(void *arg) MOCK(networkstatus_get_param, mock_kist_networkstatus_get_param); clear_options(); mocked_options.KISTSchedRunInterval = 0; - res_should = scheduler_should_use_kist(); + res_should = scheduler_can_use_kist(); res_freq = kist_scheduler_run_interval(NULL); #ifdef HAVE_KIST_SUPPORT tt_int_op(res_should, ==, 1); @@ -944,7 +944,7 @@ test_scheduler_should_use_kist(void *arg) MOCK(networkstatus_get_param, mock_vanilla_networkstatus_get_param); clear_options(); mocked_options.KISTSchedRunInterval = 0; - res_should = scheduler_should_use_kist(); + res_should = scheduler_can_use_kist(); res_freq = kist_scheduler_run_interval(NULL); tt_int_op(res_should, ==, 0); tt_int_op(res_freq, ==, -1); @@ -1023,7 +1023,7 @@ struct testcase_t scheduler_tests[] = { { "loop_vanilla", test_scheduler_loop_vanilla, TT_FORK, NULL, NULL }, { "loop_kist", test_scheduler_loop_kist, TT_FORK, NULL, NULL }, { "ns_changed", test_scheduler_ns_changed, TT_FORK, NULL, NULL}, - { "should_use_kist", test_scheduler_should_use_kist, TT_FORK, NULL, NULL }, + { "should_use_kist", test_scheduler_can_use_kist, TT_FORK, NULL, NULL }, END_OF_TESTCASES }; |