aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2020-08-25 15:02:04 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2020-08-25 15:02:04 +0300
commit4b9ed14d9bba7b6f5892bbbbcbf81c3e2414c65b (patch)
tree29b08587d9d7a71d6fa2e3930e96f49a347557b9 /src/test
parent935160ce8629096691268f9902a803c4b871bacc (diff)
parent1d0695fe7eb0b1b8176c71ecc6e5fe74a5b71378 (diff)
downloadtor-4b9ed14d9bba7b6f5892bbbbcbf81c3e2414c65b.tar.gz
tor-4b9ed14d9bba7b6f5892bbbbcbf81c3e2414c65b.zip
Merge remote-tracking branch 'tor-gitlab/mr/108'
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_logging.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/test_logging.c b/src/test/test_logging.c
index e09f7a21cd..58d0f24bd3 100644
--- a/src/test/test_logging.c
+++ b/src/test/test_logging.c
@@ -160,6 +160,7 @@ test_ratelim(void *arg)
tor_free(msg);
int i;
+ time_t first_suppressed_at = now + 60;
for (i = 0; i < 9; ++i) {
now += 60; /* one minute has passed. */
msg = rate_limit_log(&ten_min, now);
@@ -167,12 +168,15 @@ test_ratelim(void *arg)
tt_int_op(ten_min.last_allowed, OP_EQ, start);
tt_int_op(ten_min.n_calls_since_last_time, OP_EQ, i + 1);
}
+ tt_i64_op(ten_min.started_limiting, OP_EQ, first_suppressed_at);
now += 240; /* Okay, we can be done. */
msg = rate_limit_log(&ten_min, now);
tt_ptr_op(msg, OP_NE, NULL);
tt_str_op(msg, OP_EQ,
- " [9 similar message(s) suppressed in last 600 seconds]");
+ " [9 similar message(s) suppressed in last 720 seconds]");
+ tt_i64_op(now, OP_EQ, first_suppressed_at + 720);
+
done:
tor_free(msg);
}