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_service.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_service.c')
| -rw-r--r-- | src/test/test_hs_service.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index e33d593d94..49c8d29d27 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -81,9 +81,10 @@ 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; } @@ -1345,8 +1346,8 @@ test_rotate_descriptors(void *arg) hs_init(); MOCK(get_or_state, get_or_state_replacement); MOCK(circuit_mark_for_close_, mock_circuit_mark_for_close); - MOCK(networkstatus_get_live_consensus, - mock_networkstatus_get_live_consensus); + MOCK(networkstatus_get_reasonably_live_consensus, + mock_networkstatus_get_reasonably_live_consensus); /* Descriptor rotation happens with a consensus with a new SRV. */ @@ -1434,7 +1435,7 @@ test_rotate_descriptors(void *arg) hs_free_all(); UNMOCK(get_or_state); UNMOCK(circuit_mark_for_close_); - UNMOCK(networkstatus_get_live_consensus); + UNMOCK(networkstatus_get_reasonably_live_consensus); } /** Test building descriptors: picking intro points, setting up their link @@ -1454,8 +1455,8 @@ test_build_update_descriptors(void *arg) MOCK(get_or_state, get_or_state_replacement); - MOCK(networkstatus_get_live_consensus, - mock_networkstatus_get_live_consensus); + MOCK(networkstatus_get_reasonably_live_consensus, + mock_networkstatus_get_reasonably_live_consensus); dummy_state = or_state_new(); @@ -1685,8 +1686,8 @@ test_build_descriptors(void *arg) MOCK(get_or_state, get_or_state_replacement); - MOCK(networkstatus_get_live_consensus, - mock_networkstatus_get_live_consensus); + MOCK(networkstatus_get_reasonably_live_consensus, + mock_networkstatus_get_reasonably_live_consensus); dummy_state = or_state_new(); @@ -1786,8 +1787,8 @@ test_upload_descriptors(void *arg) hs_init(); MOCK(get_or_state, get_or_state_replacement); - MOCK(networkstatus_get_live_consensus, - mock_networkstatus_get_live_consensus); + MOCK(networkstatus_get_reasonably_live_consensus, + mock_networkstatus_get_reasonably_live_consensus); dummy_state = or_state_new(); |