Skip to content

fix: preserve shared rootfs during serial test cleanup #993

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
StefanPrintezis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: preserve shared rootfs during serial test cleanup #993

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Sources/Integration/Suite.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,12 +317,12 @@ struct IntegrationSuite: AsyncParsableCommand {
// container on the failure path too (see RuncTests), or this unlinks
// the clones out from under a still-running VM.
if self.maxConcurrency == 1 {
let preserve = fsPath.absolutePath()
if let entries = try? FileManager.default.contentsOfDirectory(
at: Self.testDir,
includingPropertiesForKeys: nil
) {
for url in entries where url.absolutePath() != preserve {
// Directory listings can resolve symlinks in the parent path.
for url in entries where url.lastPathComponent != fsPath.lastPathComponent {
try? FileManager.default.removeItem(at: url)
}
}
Expand Down