Skip to content

Fix reference_manifest_isolated_test to use temporary directory #4306

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
merged 2 commits into from
Jul 4, 2025
Merged

Fix reference_manifest_isolated_test to use temporary directory #4306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bff7e1f
Fix reference_manifest_isolated_test to use temporary directory
Jul 4, 2025
55450f4
keep more of directory structure
Jul 4, 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
24 changes: 15 additions & 9 deletions test/manifests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,20 @@ using ..Utils
# used with the reference manifests in `test/manifest/formats`
# ensures the manifests are valid and restored after test
function reference_manifest_isolated_test(f, dir::String; v1::Bool=false)
env_dir = joinpath(@__DIR__, "manifest", "formats", dir)
env_manifest = joinpath(env_dir, "Manifest.toml")
env_project = joinpath(env_dir, "Project.toml")
cp(env_manifest, string(env_manifest, "_backup"))
cp(env_project, string(env_project, "_backup"))
source_env_dir = joinpath(@__DIR__, "manifest", "formats", dir)
source_env_manifest = joinpath(source_env_dir, "Manifest.toml")
source_env_project = joinpath(source_env_dir, "Project.toml")

# Create a temporary directory for the test files
temp_base_dir = mktempdir()
try
# Copy entire directory structure to preserve paths that tests expect
env_dir = joinpath(temp_base_dir, dir)
cp(source_env_dir, env_dir)

env_manifest = joinpath(env_dir, "Manifest.toml")
env_project = joinpath(env_dir, "Project.toml")

isfile(env_manifest) || error("Reference manifest is missing")
if Base.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == !v1
error("Reference manifest file at $(env_manifest) is invalid")
Expand All @@ -21,10 +29,8 @@ function reference_manifest_isolated_test(f, dir::String; v1::Bool=false)
f(env_dir, env_manifest)
end
finally
cp(string(env_manifest, "_backup"), env_manifest, force = true)
rm(string(env_manifest, "_backup"))
cp(string(env_project, "_backup"), env_project, force = true)
rm(string(env_project, "_backup"))
# Clean up temporary directory
rm(temp_base_dir, recursive=true)
end
end

Expand Down