Skip to content

Support directory mtime to fix tests with recent buildbox-casd #2001

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

Merged
juergbi merged 2 commits into from
Mar 25, 2025
Merged

Support directory mtime to fix tests with recent buildbox-casd #2001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0da729d
cascache.py: Support directory mtime in `checkout()`
juergbi Mar 14, 2025
8c45f26
tests/internals/storage_vdir_import.py: Set mtime for directories
juergbi Mar 14, 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
5 changes: 5 additions & 0 deletions src/buildstream/_cas/cascache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,11 @@ def checkout(self, dest, tree, *, can_link=False, _fetch=True):
fullpath = os.path.join(dest, symlinknode.name)
os.symlink(symlinknode.target, fullpath)

node_properties = directory.node_properties
if node_properties.HasField("mtime"):
mtime = utils._parse_protobuf_timestamp(node_properties.mtime)
utils._set_file_mtime(dest, mtime)

# ensure_tree():
#
# Make sure all blobs referenced by the given directory tree are available
Expand Down
6 changes: 6 additions & 0 deletions tests/internals/storage_vdir_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ def generate_import_root(rootdir, filelist):
(dirnames, filename) = os.path.split(path)
os.makedirs(os.path.join(rootdir, dirnames), exist_ok=True)
os.symlink(content, os.path.join(rootdir, path))
# Set deterministic mtime for all directories
for (dirpath, _, _) in os.walk(rootdir):
_set_file_mtime(dirpath, MTIME)


def generate_random_root(rootno, directory):
Expand Down Expand Up @@ -116,6 +119,9 @@ def generate_random_root(rootno, directory):
relative_link = os.path.relpath(symlink_destination, start=location)
os.symlink(relative_link, target)
things.append(os.path.join(location, thingname))
# Set deterministic mtime for all directories
for (dirpath, _, _) in os.walk(rootdir):
_set_file_mtime(dirpath, MTIME)


def file_contents(path):
Expand Down
Loading