Skip to content

Commit 465b52c

Browse files
committed
Enable image_remove tests to run on windows
Signed-off-by: apostasie <[email protected]>
1 parent b1e8226 commit 465b52c

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

cmd/nerdctl/image/image_remove_test.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ func TestRemove(t *testing.T) {
4343
Description: "Remove image with stopped container - without -f",
4444
NoParallel: true,
4545
Require: test.Require(
46-
test.Not(test.Windows),
4746
test.Not(nerdtest.Docker),
4847
),
4948
Setup: func(data test.Data, helpers test.Helpers) {
@@ -68,7 +67,6 @@ func TestRemove(t *testing.T) {
6867
{
6968
Description: "Remove image with stopped container - with -f",
7069
NoParallel: true,
71-
Require: test.Not(test.Windows),
7270
Setup: func(data test.Data, helpers test.Helpers) {
7371
helpers.Ensure("run", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage)
7472
},
@@ -90,7 +88,6 @@ func TestRemove(t *testing.T) {
9088
Description: "Remove image with running container - without -f",
9189
NoParallel: true,
9290
Require: test.Require(
93-
test.Not(test.Windows),
9491
test.Not(nerdtest.Docker),
9592
),
9693
Setup: func(data test.Data, helpers test.Helpers) {
@@ -121,7 +118,6 @@ func TestRemove(t *testing.T) {
121118
// untags `imageName` (left a `<none>` image) without deletion; `docker rmi -rf imageID` fails.
122119
// In both cases, `nerdctl rmi -f` will fail.
123120
Require: test.Require(
124-
test.Not(test.Windows),
125121
test.Not(nerdtest.Docker),
126122
),
127123
Setup: func(data test.Data, helpers test.Helpers) {
@@ -146,7 +142,6 @@ func TestRemove(t *testing.T) {
146142
{
147143
Description: "Remove image with created container - without -f",
148144
NoParallel: true,
149-
Require: test.Not(test.Windows),
150145
Setup: func(data test.Data, helpers test.Helpers) {
151146
helpers.Ensure("create", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage, "sleep", nerdtest.Infinity)
152147
},
@@ -169,7 +164,6 @@ func TestRemove(t *testing.T) {
169164
{
170165
Description: "Remove image with created container - with -f",
171166
NoParallel: true,
172-
Require: test.Not(test.Windows),
173167
Setup: func(data test.Data, helpers test.Helpers) {
174168
helpers.Ensure("pull", "--quiet", testutil.NginxAlpineImage)
175169
helpers.Ensure("create", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage, "sleep", nerdtest.Infinity)
@@ -197,7 +191,6 @@ func TestRemove(t *testing.T) {
197191
Description: "Remove image with paused container - without -f",
198192
NoParallel: true,
199193
Require: test.Require(
200-
test.Not(test.Windows),
201194
test.Not(nerdtest.Docker),
202195
nerdtest.CGroup,
203196
),
@@ -225,7 +218,6 @@ func TestRemove(t *testing.T) {
225218
Description: "Remove image with paused container - with -f",
226219
NoParallel: true,
227220
Require: test.Require(
228-
test.Not(test.Windows),
229221
nerdtest.CGroup,
230222
// FIXME: nerdctl is broken
231223
// https://github.com/containerd/nerdctl/issues/3454
@@ -258,7 +250,6 @@ func TestRemove(t *testing.T) {
258250
Description: "Remove image with killed container - without -f",
259251
NoParallel: true,
260252
Require: test.Require(
261-
test.Not(test.Windows),
262253
test.Not(nerdtest.Docker),
263254
),
264255
Setup: func(data test.Data, helpers test.Helpers) {
@@ -284,7 +275,6 @@ func TestRemove(t *testing.T) {
284275
{
285276
Description: "Remove image with killed container - with -f",
286277
NoParallel: true,
287-
Require: test.Not(test.Windows),
288278
Setup: func(data test.Data, helpers test.Helpers) {
289279
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", nerdtest.Infinity)
290280
helpers.Ensure("kill", data.Identifier())

0 commit comments

Comments
 (0)