diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:14:10 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:14:10 -0500 |
| commit | c36c6b50575cc0db94e6e770f5b4d437c851ff59 (patch) | |
| tree | f5b74ff508ed401ef086e159a47703663d86b2a3 /src/test/test_hs_cache.c | |
| parent | 0b49cacd6354063b94338058ff6b1ab52b03f3f1 (diff) | |
| parent | dd5fbc1bd9d54d191240ac4e15b5324fb83a903d (diff) | |
| download | tor-c36c6b50575cc0db94e6e770f5b4d437c851ff59.tar.gz tor-c36c6b50575cc0db94e6e770f5b4d437c851ff59.zip | |
Merge branch 'maint-0.4.3' into release-0.4.3
Diffstat (limited to 'src/test/test_hs_cache.c')
| -rw-r--r-- | src/test/test_hs_cache.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c index 8ea550b65f..a1df2b0eea 100644 --- a/src/test/test_hs_cache.c +++ b/src/test/test_hs_cache.c @@ -462,9 +462,10 @@ test_hsdir_revision_counter_check(void *arg) static networkstatus_t mock_ns; static networkstatus_t * -mock_networkstatus_get_live_consensus(time_t now) +mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor) { (void) now; + (void) flavor; return &mock_ns; } @@ -485,8 +486,8 @@ test_client_cache(void *arg) /* Initialize HSDir cache subsystem */ init_test(); - MOCK(networkstatus_get_live_consensus, - mock_networkstatus_get_live_consensus); + MOCK(networkstatus_get_reasonably_live_consensus, + mock_networkstatus_get_reasonably_live_consensus); /* Set consensus time */ parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", @@ -586,8 +587,8 @@ test_client_cache_decrypt(void *arg) /* Initialize HSDir cache subsystem */ hs_init(); - MOCK(networkstatus_get_live_consensus, - mock_networkstatus_get_live_consensus); + MOCK(networkstatus_get_reasonably_live_consensus, + mock_networkstatus_get_reasonably_live_consensus); /* Set consensus time */ parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", @@ -642,7 +643,7 @@ test_client_cache_decrypt(void *arg) hs_free_all(); - UNMOCK(networkstatus_get_live_consensus); + UNMOCK(networkstatus_get_reasonably_live_consensus); } static void @@ -656,8 +657,8 @@ test_client_cache_remove(void *arg) hs_init(); - MOCK(networkstatus_get_live_consensus, - mock_networkstatus_get_live_consensus); + MOCK(networkstatus_get_reasonably_live_consensus, + mock_networkstatus_get_reasonably_live_consensus); /* Set consensus time. Lookup will not return the entry if it has expired * and it is checked against the consensus valid_after time. */ @@ -695,7 +696,7 @@ test_client_cache_remove(void *arg) hs_descriptor_free(desc1); hs_free_all(); - UNMOCK(networkstatus_get_live_consensus); + UNMOCK(networkstatus_get_reasonably_live_consensus); } struct testcase_t hs_cache[] = { |