Skip to content

Fix flaky cache test #6373

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
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Fix flaky cache test #6373

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6801e4
Fix flaky cache test
aw-andre Nov 14, 2025
6535c65
Update runtimes_cache_test.cpp
aw-andre Nov 15, 2025
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
12 changes: 8 additions & 4 deletions toolchain/driver/runtimes_cache_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,10 +609,12 @@ TEST_F(RuntimesCacheTest, LookupWithManyStaleRuntimes) {
// Get the Unix-like inode of the directories so we can check whether
// subsequent lookups create a new directory.
auto runtimes1_inode = runtimes1.base_dir().Stat()->unix_inode();
auto stale_runtimes_0_inode =
stale_runtimes[0].base_dir().Stat()->unix_inode();
Comment on lines -612 to -613
Copy link
Contributor

@josh11b josh11b Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this will no longer compile.

auto runtimes2_inode = runtimes2.base_dir().Stat()->unix_inode();

// Use the modification time for the stale runtime as comparing inodes gives a
// false failure when the filesystem reuses the inode.
auto stale_runtimes_0_mtime = stale_runtimes[0].base_dir().Stat()->mtime();

// Now adjust their age backwards in time by two years to make them very, very
// stale.
auto now = Filesystem::Clock::now();
Expand Down Expand Up @@ -640,8 +642,10 @@ TEST_F(RuntimesCacheTest, LookupWithManyStaleRuntimes) {
EXPECT_THAT(runtimes2.base_dir().Stat()->unix_inode(), Eq(runtimes2_inode));

// One of the stale runtimes should be freshly created though.
EXPECT_THAT(stale_runtimes_0.base_dir().Stat()->unix_inode(),
Ne(stale_runtimes_0_inode));
EXPECT_FALSE(stale_runtimes_0.base_dir().Stat()->unix_inode()
== stale_runtimes_0_inode &&
stale_runtimes_0.base_dir().Stat()->mtime()
== stale_runtimes_0_mtime);
Comment on lines +645 to +648
Copy link
Contributor

@CarbonInfraBot CarbonInfraBot Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[diff] reported by reviewdog 🐶

Suggested change
EXPECT_FALSE(stale_runtimes_0.base_dir().Stat()->unix_inode()
== stale_runtimes_0_inode &&
stale_runtimes_0.base_dir().Stat()->mtime()
== stale_runtimes_0_mtime);
EXPECT_FALSE(stale_runtimes_0.base_dir().Stat()->unix_inode() ==
stale_runtimes_0_inode &&
stale_runtimes_0.base_dir().Stat()->mtime() ==
stale_runtimes_0_mtime);

}

TEST_F(RuntimesCacheTest, LookupWithTooManyRuntimes) {
Expand Down
Loading