Skip to content

Commit fa78590

Browse files
author
MarcoFalke
committed
test: Use mocktime to avoid intermittent failure
1 parent b8e5bbd commit fa78590

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/test/rpc_tests.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,11 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
275275

276276
BOOST_CHECK_NO_THROW(CallRPC(std::string("clearbanned")));
277277

278+
auto now = 10'000s;
279+
SetMockTime(now);
278280
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("setban 127.0.0.0/24 add 200")));
281+
SetMockTime(now += 2s);
282+
const int64_t time_remaining_expected{198};
279283
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("listbanned")));
280284
ar = r.get_array();
281285
o1 = ar[0].get_obj();
@@ -284,12 +288,10 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
284288
const int64_t ban_created{find_value(o1, "ban_created").get_int64()};
285289
const int64_t ban_duration{find_value(o1, "ban_duration").get_int64()};
286290
const int64_t time_remaining{find_value(o1, "time_remaining").get_int64()};
287-
const int64_t now{GetTime()};
288291
BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/24");
289-
BOOST_CHECK(banned_until > now);
290-
BOOST_CHECK(banned_until - now <= 200);
292+
BOOST_CHECK_EQUAL(banned_until, time_remaining_expected + now.count());
291293
BOOST_CHECK_EQUAL(ban_duration, banned_until - ban_created);
292-
BOOST_CHECK_EQUAL(time_remaining, banned_until - now);
294+
BOOST_CHECK_EQUAL(time_remaining, time_remaining_expected);
293295

294296
// must throw an exception because 127.0.0.1 is in already banned subnet range
295297
BOOST_CHECK_THROW(r = CallRPC(std::string("setban 127.0.0.1 add")), std::runtime_error);
@@ -333,6 +335,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
333335
o1 = ar[0].get_obj();
334336
adr = find_value(o1, "address");
335337
BOOST_CHECK_EQUAL(adr.get_str(), "2001:4d48:ac57:400:cacf:e9ff:fe1d:9c63/128");
338+
SetMockTime(0s);
336339
}
337340

338341
BOOST_AUTO_TEST_CASE(rpc_convert_values_generatetoaddress)

0 commit comments

Comments
 (0)