Skip to content

Fixing a bug in the shared setup_helper to make the wait_on_started ASSERT configurable by the calling test #3806

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
merged 1 commit into from
Jun 26, 2025
+12 −9
Merged

Fixing a bug in the shared setup_helper to make the wait_on_started ASSERT configurable by the calling test #3806

Show file tree
Hide file tree
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
19 changes: 11 additions & 8 deletions Drv/TcpServer/test/ut/TcpServerTester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Drv {
// Construction and destruction
// ----------------------------------------------------------------------

void TcpServerTester ::setup_helper(bool recv_thread, bool reconnect) {
void TcpServerTester ::setup_helper(bool recv_thread, bool reconnect, bool expect_started) {
Drv::SocketIpStatus status1 = Drv::SOCK_SUCCESS;
U16 port = 0;
EXPECT_FALSE(component.isStarted());
Expand All @@ -36,9 +36,12 @@ void TcpServerTester ::setup_helper(bool recv_thread, bool reconnect) {
this->component.start(name, Os::Task::TASK_PRIORITY_DEFAULT, Os::Task::TASK_DEFAULT);
}
// Component should always launch the listening server on configure
// The thread will retry if the configure fails
EXPECT_TRUE(this->wait_on_started(true, Drv::Test::get_configured_delay_ms()/10 + 1));
EXPECT_TRUE(component.isStarted());
// The thread will retry if the configure fails. When we do not expect it to be started, we must wait for it to
// stop.
if (expect_started) {
EXPECT_TRUE(this->wait_on_started(true, Drv::Test::get_configured_delay_ms() / 10 + 1));
EXPECT_TRUE(component.isStarted());
}
}

void TcpServerTester ::test_with_loop(U32 iterations, bool recv_thread) {
Expand Down Expand Up @@ -180,8 +183,8 @@ void TcpServerTester ::test_no_automatic_send_connection() {
Drv::TcpClientSocket client;
Drv::SocketDescriptor client_fd;

// Set up the server without automatic connection
this->setup_helper(false, true);
// Set up the server without automatic connection, and don't expect it to stay started
this->setup_helper(false, true, false);
this->component.setAutomaticOpen(false);
Drv::Test::force_recv_timeout(client_fd.fd, client);

Expand All @@ -202,8 +205,8 @@ void TcpServerTester ::test_no_automatic_recv_connection() {
Drv::TcpClientSocket client;
Drv::SocketDescriptor client_fd;

// Set up the server without automatic connection
this->setup_helper(true, false);
// Set up the server without automatic connection, and don't expect it to stay started
this->setup_helper(true, false, false);

// Connect a client to the server so it is waiting in the "listen" queue
// The read thread should not automatically connect and will thus exit with a failure
Expand Down
2 changes: 1 addition & 1 deletion Drv/TcpServer/test/ut/TcpServerTester.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace Drv {
// Tests
// ----------------------------------------------------------------------

void setup_helper(bool recv_thread, bool reconnect);
void setup_helper(bool recv_thread, bool reconnect, bool expect_started = true);

//! Test basic messaging
//!
Expand Down
Loading