Skip to content

Fix tsan errors in tests that add listeners #8713

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

Open
kcooney wants to merge 1 commit into
base: 2027
Choose a base branch
from
Open

Fix tsan errors in tests that add listeners #8713

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
1 change: 1 addition & 0 deletions ntcore/src/test/native/cpp/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ int main(int argc, char** argv) {
});
::testing::InitGoogleMock(&argc, argv);
int ret = RUN_ALL_TESTS();
wpi::nt::ResetInstance(wpi::nt::GetDefaultInstance());
return ret;
}

Expand Down
5 changes: 4 additions & 1 deletion wpilibc/src/test/native/cpp/OpModeRobotTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ class OpModeRobotTest : public ::testing::Test {
wpi::sim::SetProgramStarted(false);
}

void TearDown() override { wpi::sim::ResumeTiming(); }
void TearDown() override {
wpi::sim::ResumeTiming();
wpi::nt::ResetInstance(wpi::nt::GetDefaultInstance());
}
};

class MockRobot;
Expand Down
5 changes: 4 additions & 1 deletion wpilibc/src/test/native/cpp/TimedRobotTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ class TimedRobotTest : public ::testing::Test {
wpi::sim::SetProgramStarted(false);
}

void TearDown() override { wpi::sim::ResumeTiming(); }
void TearDown() override {
wpi::sim::ResumeTiming();
wpi::nt::ResetInstance(wpi::nt::GetDefaultInstance());
}
};

class MockRobot : public TimedRobot {
Expand Down
5 changes: 4 additions & 1 deletion wpilibc/src/test/native/cpp/TimesliceRobotTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ class TimesliceRobotTest : public ::testing::Test {
wpi::sim::SetProgramStarted(false);
}

void TearDown() override { wpi::sim::ResumeTiming(); }
void TearDown() override {
wpi::sim::ResumeTiming();
wpi::nt::ResetInstance(wpi::nt::GetDefaultInstance());
}
};

class MockRobot : public TimesliceRobot {
Expand Down
Loading