mii/mozc
1
0
Fork 0
mirror of https://github.com/mii443/mozc.git synced 2025-08-22 16:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TSAN error in session_watch_dog_test.

Browse Source 
From https://google.github.io/googletest/gmock_for_dummies.html#using-mocks-in-tests:

> Important note: gMock requires expectations to be set before the mock functions are called, otherwise the behavior is undefined. Do not alternate between calls to EXPECT_CALL() and calls to the mock functions, and do not set any expectations on a mock after passing the mock to an API.

This is the last (currently known) TSAN error in mozc :)

PiperOrigin-RevId: 731217246
This commit is contained in:
Tomoki Nakagawa
2025-02-26 09:46:03 +00:00
committed by Hiroyuki Komatsu
parent 914e13462e
commit 64b59251cb
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/session/session_watch_dog_test.cc
View File

@ -49,7 +49,6 @@
namespace mozc {
namespace {
using ::testing::Mock;
using ::testing::Return;
// Returns the given CPU load values in order.
@ -94,7 +93,7 @@ client::ClientMock *CreateMockClient() {
TEST(SessionWatchDogTest, SessionWatchDogTest) {
constexpr absl::Duration kInterval = absl::Seconds(1);
auto *client = CreateMockClient();
auto stats = std::make_unique<TestCPUStats>(std::vector<float>(10, 0.0f));
auto stats = std::make_unique<TestCPUStats>(std::vector<float>(5, 0.0f));
EXPECT_CALL(*client, Cleanup()).Times(5);
SessionWatchDog watchdog(kInterval, absl::WrapUnique(client),
@ -105,16 +104,12 @@ TEST(SessionWatchDogTest, SessionWatchDogTest) {
EXPECT_EQ(watchdog.interval(), kInterval);
absl::SleepFor(absl::Milliseconds(5500)); // 5.5 sec
Mock::VerifyAndClearExpectations(&client);
EXPECT_CALL(*client, Cleanup()).Times(5);
absl::SleepFor(absl::Milliseconds(5000)); // 10.5 sec
}
TEST(SessionWatchDogTest, SessionWatchDogCPUStatsTest) {
constexpr absl::Duration kInterval = absl::Seconds(1);
auto *client = CreateMockClient();
auto *cpu_loads = new TestCPUStats(std::vector<float>(20, 0.8f));
auto *cpu_loads = new TestCPUStats(std::vector<float>(5, 0.8f));
mozc::SessionWatchDog watchdog(kInterval, absl::WrapUnique(client),
absl::WrapUnique(cpu_loads));
@ -123,15 +118,6 @@ TEST(SessionWatchDogTest, SessionWatchDogCPUStatsTest) {
absl::SleepFor(absl::Milliseconds(100));
EXPECT_EQ(watchdog.interval(), kInterval);
absl::SleepFor(absl::Milliseconds(5500)); // 5.5 sec
// not called
Mock::VerifyAndClearExpectations(&client);
// CPU loads become low
EXPECT_CALL(*client, Cleanup()).Times(5);
cpu_loads->Set(std::vector<float>(20, 0.0f));
absl::SleepFor(absl::Milliseconds(5000)); // 5 sec
}
TEST(SessionWatchDogTest, SessionCanSendCleanupCommandTest) {