Skip to content

Fix broadcaster test race. #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 1 commit into from
May 30, 2025
Merged

Fix broadcaster test race. #467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions test/net/broadcaster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,34 @@ BOOST_AUTO_TEST_CASE(broadcaster__subscribe__stop__expected_code)
constexpr auto expected_ec = error::invalid_magic;
auto result = true;

std::promise<code> promise;
// Subscription will capture message and stop notifications.
std::promise<code> sub_promise;
std::promise<code> ping_promise;

boost::asio::post(strand, [&]() NOEXCEPT
{
BOOST_REQUIRE(!instance.subscribe(
sub_promise.set_value(instance.subscribe(
[&](const code& ec, const messages::ping::cptr& ping, broadcaster::channel_id id) NOEXCEPT
{
// Stop notification has nullptr message, zero id, and specified code.
result &= is_null(ping);
result &= is_zero(id);
promise.set_value(ec);
ping_promise.set_value(ec);
return true;
}, channel_id));
});

// Wait on successful subscription.
BOOST_REQUIRE(!sub_promise.get_future().get());

boost::asio::post(strand, [&]() NOEXCEPT
{
instance.stop(expected_ec);
});

pool.stop();
BOOST_REQUIRE(pool.join());
BOOST_REQUIRE_EQUAL(promise.get_future().get(), expected_ec);
BOOST_REQUIRE_EQUAL(ping_promise.get_future().get(), expected_ec);
BOOST_REQUIRE(result);
}

Expand All @@ -83,16 +89,17 @@ BOOST_AUTO_TEST_CASE(broadcaster__notify__valid_nonced_ping__expected_notificati
auto result = true;

// Subscription will capture message and stop notifications.
std::promise<code> promise;
std::promise<code> sub_promise;
std::promise<code> ping_promise;
boost::asio::post(strand, [&]() NOEXCEPT
{
BOOST_REQUIRE(!instance.subscribe(
sub_promise.set_value(instance.subscribe(
[&](const code& ec, const messages::ping::cptr& ping, broadcaster::channel_id id) NOEXCEPT
{
// Handle stop notification (unavoidable test condition).
if (!ping)
{
promise.set_value(ec);
ping_promise.set_value(ec);
return true;
}

Expand All @@ -104,6 +111,9 @@ BOOST_AUTO_TEST_CASE(broadcaster__notify__valid_nonced_ping__expected_notificati
}, channel_id));
});

// Wait on successful subscription.
BOOST_REQUIRE(!sub_promise.get_future().get());

// Move vs. emplace required on some platforms, possibly due to default constructor.
const auto ping = std::make_shared<messages::ping>(messages::ping{ expected_nonce });
boost::asio::post(strand, [&]() NOEXCEPT
Expand All @@ -118,7 +128,7 @@ BOOST_AUTO_TEST_CASE(broadcaster__notify__valid_nonced_ping__expected_notificati

pool.stop();
BOOST_REQUIRE(pool.join());
BOOST_REQUIRE_EQUAL(promise.get_future().get(), expected_ec);
BOOST_REQUIRE_EQUAL(ping_promise.get_future().get(), expected_ec);
BOOST_REQUIRE(result);
}

Expand Down
Loading