mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
[ntcore,wpilib] Fix tsan errors in tests that add NT listeners (#8713)
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user