Skip to content

Commit 772bb09

Browse files
authored
Merge pull request #4247 from apostasie/2025-05-net-test-cleanup
[CI]: tests cleanup
2 parents 3914f63 + d9cf528 commit 772bb09

File tree

4 files changed

+105
-173
lines changed

4 files changed

+105
-173
lines changed

cmd/nerdctl/builder/builder_build_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ CMD ["echo", "nerdctl-build-test-string"]`, testutil.CommonImage)
110110
},
111111
Cleanup: func(data test.Data, helpers test.Helpers) {
112112
helpers.Anyhow("rmi", "-f", data.Identifier("ignored"))
113+
helpers.Anyhow("rmi", "-f", data.Identifier())
113114
},
114115
Expected: test.Expects(expect.ExitCodeGenericFail, nil, nil),
115116
},

cmd/nerdctl/container/container_exec_linux_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ func TestExecTTY(t *testing.T) {
6565

6666
testCase.Setup = func(data test.Data, helpers test.Helpers) {
6767
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", nerdtest.Infinity)
68+
69+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
70+
6871
data.Labels().Set("container_name", data.Identifier())
6972
}
7073

cmd/nerdctl/container/container_run_mount_linux_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,8 @@ func TestRunBindMountBind(t *testing.T) {
352352
"top",
353353
)
354354

355+
nerdtest.EnsureContainerStarted(helpers, data.Identifier("container"))
356+
355357
// Save host rwDir location and container id for subtests
356358
data.Labels().Set("container", data.Identifier("container"))
357359
data.Labels().Set("rwDir", rwDir)

0 commit comments

Comments
 (0)