Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 13:59:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7818

Browse Source 
9c8e3e8 unit_tests: fix broken tests (anon)
This commit is contained in:
luigi1111 2021-08-11 22:40:13 -04:00
commit 82149bfe44
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit_tests/epee_boosted_tcp_server.cpp
View File

@ -111,8 +111,7 @@ TEST(boosted_tcp_server, worker_threads_are_exception_resistant)
{ {
boost::unique_lock<boost::mutex> lock(mtx); boost::unique_lock<boost::mutex> lock(mtx);
ASSERT_NE(boost::cv_status::timeout, cond.wait_for(lock, boost::chrono::seconds(5))); ASSERT_TRUE(cond.wait_for(lock, boost::chrono::seconds(5), [&counter]{ return counter == 4; }));
ASSERT_EQ(4, counter);
} }
// Check if threads are alive // Check if threads are alive
@ -125,8 +124,7 @@ TEST(boosted_tcp_server, worker_threads_are_exception_resistant)
{ {
boost::unique_lock<boost::mutex> lock(mtx); boost::unique_lock<boost::mutex> lock(mtx);
ASSERT_NE(boost::cv_status::timeout, cond.wait_for(lock, boost::chrono::seconds(5))); ASSERT_TRUE(cond.wait_for(lock, boost::chrono::seconds(5), [&counter]{ return counter == 4; }));
ASSERT_EQ(4, counter);
} }
srv.send_stop_signal(); srv.send_stop_signal();

10
tests/unit_tests/node_server.cpp
View File

@ -795,9 +795,11 @@ TEST(cryptonote_protocol_handler, race_condition)
workers_t workers; workers_t workers;
} check; } check;
check.work = std::make_shared<work_t>(check.io_context); check.work = std::make_shared<work_t>(check.io_context);
check.workers.emplace_back([&check]{ while (check.workers.size() < 2) {
check.io_context.run(); check.workers.emplace_back([&check]{
}); check.io_context.run();
});
}
while (daemon.main.conn.size() < 1) { while (daemon.main.conn.size() < 1) {
daemon.main.conn.emplace_back(new connection_t(check.io_context, daemon.main.shared_state, {}, {})); daemon.main.conn.emplace_back(new connection_t(check.io_context, daemon.main.shared_state, {}, {}));
daemon.alt.conn.emplace_back(new connection_t(io_context, daemon.alt.shared_state, {}, {})); daemon.alt.conn.emplace_back(new connection_t(io_context, daemon.alt.shared_state, {}, {}));
@ -856,7 +858,7 @@ TEST(cryptonote_protocol_handler, race_condition)
} }
} }
while (daemon.main.conn.size() < 2) { while (daemon.main.conn.size() < 2) {
daemon.main.conn.emplace_back(new connection_t(io_context, daemon.main.shared_state, {}, {})); daemon.main.conn.emplace_back(new connection_t(check.io_context, daemon.main.shared_state, {}, {}));
daemon.alt.conn.emplace_back(new connection_t(io_context, daemon.alt.shared_state, {}, {})); daemon.alt.conn.emplace_back(new connection_t(io_context, daemon.alt.shared_state, {}, {}));
create_conn_pair(daemon.main.conn.back(), daemon.alt.conn.back()); create_conn_pair(daemon.main.conn.back(), daemon.alt.conn.back());
conduct_handshake(daemon.alt.net_node, daemon.alt.conn.back()); conduct_handshake(daemon.alt.net_node, daemon.alt.conn.back());