Skip to content

Commit

Permalink
chore(test/libsinsp_e2e): improve test reliability.
Browse files Browse the repository at this point in the history
Signed-off-by: Federico Di Pierro <[email protected]>
  • Loading branch information
FedeDP authored and poiana committed Oct 7, 2024
1 parent 634af98 commit 03f1d30
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions test/libsinsp_e2e/forking.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ TEST_F(sys_call_test, DISABLED_forking_clone_fs) {
};

//
// OUTPUT VALDATION
// OUTPUT VALIDATION
//
captured_event_callback_t callback = [&](const callback_param& param) {
sinsp_evt* e = param.m_evt;
Expand Down Expand Up @@ -519,12 +519,10 @@ TEST_F(sys_call_test, forking_clone_nofs) {
FAIL();

close(cp.fd);

sleep(1);
};

//
// OUTPUT VALDATION
// OUTPUT VALIDATION
//
captured_event_callback_t callback = [&](const callback_param& param) {
sinsp_evt* e = param.m_evt;
Expand Down Expand Up @@ -583,6 +581,7 @@ TEST_F(sys_call_test, forking_clone_nofs) {

ASSERT_NO_FATAL_FAILURE(
{ event_capture::run(test, callback, filter, event_capture::do_nothing, cleanup); });

EXPECT_EQ(callnum, 4);
}

Expand Down Expand Up @@ -634,15 +633,17 @@ TEST_F(sys_call_test, forking_clone_cwd) {
FAIL();
}

usleep(500);
// Give new thread enough time to exit
sleep(1);

// The cloned child called chdir("/"); we expect to retrieve "/" here.
std::string tmps = getcwd(bcwd, 256);

ASSERT_TRUE(chdir(oriwd) == 0);
};

//
// OUTPUT VALDATION
// OUTPUT VALIDATION
//
captured_event_callback_t callback = [&](const callback_param& param) {
sinsp_evt* e = param.m_evt;
Expand All @@ -668,9 +669,15 @@ TEST_F(sys_call_test, forking_clone_cwd) {

if(ti->m_tid == ptid) {
if(callnum > 1) {
// last getcwd call in the test
EXPECT_EQ(bcwd, ti->get_cwd());
EXPECT_EQ(bcwd, std::string("/"));
} else {
// first getcwd call in the test
EXPECT_EQ(std::string(oriwd) + "/", ti->get_cwd());
}
} else if(ti->m_tid == ctid) {
// getcwd call by the child
EXPECT_EQ("/", ti->get_cwd());
}

Expand Down

0 comments on commit 03f1d30

Please sign in to comment.