diff options
| author | George Kadianakis <desnacked@riseup.net> | 2017-09-08 19:06:20 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2017-09-08 19:07:00 +0300 |
| commit | e7bdb9eedce5edd014090883c222eb474648a87b (patch) | |
| tree | 0e79177d9cc25296ef1c6483096f6338528389c6 /src/test/test_hs_common.c | |
| parent | eb81a8e69c654abc0830ce76899945235cf09d7d (diff) | |
| download | tor-e7bdb9eedce5edd014090883c222eb474648a87b.tar.gz tor-e7bdb9eedce5edd014090883c222eb474648a87b.zip | |
prop224: hs_time_between_tp_and_srv() -> hs_in_period_between_tp_and_srv()
Conflicts:
src/or/nodelist.c
Diffstat (limited to 'src/test/test_hs_common.c')
| -rw-r--r-- | src/test/test_hs_common.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index a2ebe03d74..4b5b0fe3e1 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -786,27 +786,27 @@ test_time_between_tp_and_srv(void *arg) ret = parse_rfc1123_time("Sat, 26 Oct 1985 00:00:00 UTC", &ns.valid_after); tt_int_op(ret, OP_EQ, 0); - ret = hs_time_between_tp_and_srv(&ns, 0); + ret = hs_in_period_between_tp_and_srv(&ns, 0); tt_int_op(ret, OP_EQ, 0); ret = parse_rfc1123_time("Sat, 26 Oct 1985 11:00:00 UTC", &ns.valid_after); tt_int_op(ret, OP_EQ, 0); - ret = hs_time_between_tp_and_srv(&ns, 0); + ret = hs_in_period_between_tp_and_srv(&ns, 0); tt_int_op(ret, OP_EQ, 0); ret = parse_rfc1123_time("Sat, 26 Oct 1985 12:00:00 UTC", &ns.valid_after); tt_int_op(ret, OP_EQ, 0); - ret = hs_time_between_tp_and_srv(&ns, 0); + ret = hs_in_period_between_tp_and_srv(&ns, 0); tt_int_op(ret, OP_EQ, 1); ret = parse_rfc1123_time("Sat, 26 Oct 1985 23:00:00 UTC", &ns.valid_after); tt_int_op(ret, OP_EQ, 0); - ret = hs_time_between_tp_and_srv(&ns, 0); + ret = hs_in_period_between_tp_and_srv(&ns, 0); tt_int_op(ret, OP_EQ, 1); ret = parse_rfc1123_time("Sat, 26 Oct 1985 00:00:00 UTC", &ns.valid_after); tt_int_op(ret, OP_EQ, 0); - ret = hs_time_between_tp_and_srv(&ns, 0); + ret = hs_in_period_between_tp_and_srv(&ns, 0); tt_int_op(ret, OP_EQ, 0); done: @@ -1065,7 +1065,8 @@ typedef struct reachability_cfg_t { /* Is the client and service expected to be in a new time period. After * setting the consensus time, the reachability test checks - * hs_time_between_tp_and_srv() and test the returned value against this. */ + * hs_in_period_between_tp_and_srv() and test the returned value against + * this. */ unsigned int service_in_new_tp; unsigned int client_in_new_tp; @@ -1300,9 +1301,9 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario) &mock_client_ns->fresh_until); /* New time period checks for this scenario. */ - tt_int_op(hs_time_between_tp_and_srv(mock_service_ns, 0), OP_EQ, + tt_int_op(hs_in_period_between_tp_and_srv(mock_service_ns, 0), OP_EQ, cfg->service_in_new_tp); - tt_int_op(hs_time_between_tp_and_srv(mock_client_ns, 0), OP_EQ, + tt_int_op(hs_in_period_between_tp_and_srv(mock_client_ns, 0), OP_EQ, cfg->client_in_new_tp); /* Set the SRVs for this scenario. */ |