Skip to content

test: fix flaky TestImageConvert/soci test #4736

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

Draft
weiyuhang2011 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

test: fix flaky TestImageConvert/soci test #4736

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
13 changes: 12 additions & 1 deletion cmd/nerdctl/image/image_convert_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ func TestImageConvert(t *testing.T) {
nerdtest.Soci,
nerdtest.SociVersion("0.10.0"),
),
Setup: func(data test.Data, helpers test.Helpers) {
// Clean up any existing SOCI indices to avoid stale ztoc data
helpers.Anyhow("rmi", "-f", testutil.CommonImage)
helpers.Anyhow("system", "prune", "--force")
helpers.Ensure("pull", "--quiet", "--all-platforms", testutil.CommonImage)
},
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier("converted-image"))
},
Expand All @@ -115,6 +121,12 @@ func TestImageConvert(t *testing.T) {
nerdtest.Soci,
nerdtest.SociVersion("0.10.0"),
),
Setup: func(data test.Data, helpers test.Helpers) {
// Clean up any existing SOCI indices to avoid stale ztoc data
helpers.Anyhow("rmi", "-f", testutil.CommonImage)
helpers.Anyhow("system", "prune", "--force")
helpers.Ensure("pull", "--quiet", "--all-platforms", testutil.CommonImage)
},
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier("converted-image"))
},
Expand All @@ -130,7 +142,6 @@ func TestImageConvert(t *testing.T) {
}

testCase.Run(t)

}

func TestImageConvertNydusVerify(t *testing.T) {
Expand Down
Loading