Skip to content

Commit 3c333bb

Browse files
authored
Merge pull request #4248 from apostasie/2025-05-enable-tests
[CI]: re-enable tests following fixes
2 parents 9807c4d + 3388ef6 commit 3c333bb

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

cmd/nerdctl/image/image_list_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,13 @@ RUN echo "actually creating a layer so that docker sets the createdAt time"
269269
},
270270
{
271271
Description: "since=non-exists-image",
272-
Require: nerdtest.NerdctlNeedsFixing("https://github.com/containerd/nerdctl/issues/3511"),
273272
Command: test.Command("images", "--filter", "since=non-exists-image"),
274-
Expected: test.Expects(expect.ExitCodeGenericFail, []error{errors.New("No such image: ")}, nil),
273+
Expected: test.Expects(expect.ExitCodeGenericFail, []error{errors.New("no such image: ")}, nil),
275274
},
276275
{
277276
Description: "before=non-exists-image",
278-
Require: nerdtest.NerdctlNeedsFixing("https://github.com/containerd/nerdctl/issues/3511"),
279277
Command: test.Command("images", "--filter", "before=non-exists-image"),
280-
Expected: test.Expects(expect.ExitCodeGenericFail, []error{errors.New("No such image: ")}, nil),
278+
Expected: test.Expects(expect.ExitCodeGenericFail, []error{errors.New("no such image: ")}, nil),
281279
},
282280
},
283281
}

cmd/nerdctl/volume/volume_list_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,6 @@ func TestVolumeLsFilter(t *testing.T) {
282282
},
283283
{
284284
Description: "Retrieving name=volume1 and name=volume2",
285-
// Nerdctl filter behavior is broken
286-
Require: nerdtest.NerdctlNeedsFixing("https://github.com/containerd/nerdctl/issues/3452"),
287285
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
288286
return helpers.Command("volume", "ls", "--quiet", "--filter", "name="+data.Labels().Get("vol1"), "--filter", "name="+data.Labels().Get("vol2"))
289287
},

0 commit comments

Comments
 (0)