Skip to content

CI: test framework, part II #3890

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

Merged
merged 1 commit into from
Feb 27, 2025
Merged

CI: test framework, part II #3890

Show file tree
Hide file tree
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
8 changes: 5 additions & 3 deletions cmd/nerdctl/builder/builder_build_oci_layout_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ import (

"gotest.tools/v3/assert"

"github.com/containerd/nerdctl/mod/tigron/require"
"github.com/containerd/nerdctl/mod/tigron/test"

"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
"github.com/containerd/nerdctl/v2/pkg/testutil/test"
)

func TestBuildContextWithOCILayout(t *testing.T) {
Expand All @@ -36,9 +38,9 @@ func TestBuildContextWithOCILayout(t *testing.T) {
var dockerBuilderArgs []string

testCase := &test.Case{
Require: test.Require(
Require: require.All(
nerdtest.Build,
test.Not(test.Windows),
require.Not(require.Windows),
),
Cleanup: func(data test.Data, helpers test.Helpers) {
if nerdtest.IsDocker() {
Expand Down
75 changes: 39 additions & 36 deletions cmd/nerdctl/builder/builder_build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ import (

"gotest.tools/v3/assert"

"github.com/containerd/nerdctl/mod/tigron/expect"
"github.com/containerd/nerdctl/mod/tigron/require"
"github.com/containerd/nerdctl/mod/tigron/test"

"github.com/containerd/nerdctl/v2/pkg/platformutil"
"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
"github.com/containerd/nerdctl/v2/pkg/testutil/test"
)

func TestBuildBasics(t *testing.T) {
Expand Down Expand Up @@ -60,7 +63,7 @@ CMD ["echo", "nerdctl-build-test-string"]`, testutil.CommonImage)
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
},
{
Description: "Successfully build with 'buildctx first', 'tag second'",
Expand All @@ -73,7 +76,7 @@ CMD ["echo", "nerdctl-build-test-string"]`, testutil.CommonImage)
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
},
{
Description: "Successfully build with output docker, main tag still works",
Expand All @@ -86,7 +89,7 @@ CMD ["echo", "nerdctl-build-test-string"]`, testutil.CommonImage)
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
},
{
Description: "Successfully build with output docker, name cannot be used",
Expand Down Expand Up @@ -126,7 +129,7 @@ func TestCanBuildOnOtherPlatform(t *testing.T) {
}

testCase := &test.Case{
Require: test.Require(
Require: require.All(
nerdtest.Build,
requireEmulation,
),
Expand Down Expand Up @@ -179,7 +182,7 @@ CMD ["cat", "/hello2"]`, data.Identifier("first"))
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
return helpers.Command("run", "--rm", data.Identifier("second"))
},
Expected: test.Expects(0, nil, test.Equals("hello2\n")),
Expected: test.Expects(0, nil, expect.Equals("hello2\n")),
}

testCase.Run(t)
Expand All @@ -191,9 +194,9 @@ func TestBuildFromContainerd(t *testing.T) {
nerdtest.Setup()

testCase := &test.Case{
Require: test.Require(
Require: require.All(
nerdtest.Build,
test.Not(nerdtest.Docker),
require.Not(nerdtest.Docker),
),
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier("first"))
Expand All @@ -213,7 +216,7 @@ CMD ["cat", "/hello2"]`, data.Identifier("first"))
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
return helpers.Command("run", "--rm", data.Identifier("second"))
},
Expected: test.Expects(0, nil, test.Equals("hello2\n")),
Expected: test.Expects(0, nil, expect.Equals("hello2\n")),
}

testCase.Run(t)
Expand Down Expand Up @@ -397,7 +400,7 @@ CMD echo $TEST_STRING
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("1\n")),
Expected: test.Expects(0, nil, expect.Equals("1\n")),
},
{
Description: "ArgValueOverridesDefault",
Expand All @@ -410,7 +413,7 @@ CMD echo $TEST_STRING
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("2\n")),
Expected: test.Expects(0, nil, expect.Equals("2\n")),
},
{
Description: "EmptyArgValueOverridesDefault",
Expand All @@ -423,7 +426,7 @@ CMD echo $TEST_STRING
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("\n")),
Expected: test.Expects(0, nil, expect.Equals("\n")),
},
{
Description: "UnsetArgKeyPreservesDefault",
Expand All @@ -436,7 +439,7 @@ CMD echo $TEST_STRING
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("1\n")),
Expected: test.Expects(0, nil, expect.Equals("1\n")),
},
{
Description: "EnvValueOverridesDefault",
Expand All @@ -452,7 +455,7 @@ CMD echo $TEST_STRING
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("3\n")),
Expected: test.Expects(0, nil, expect.Equals("3\n")),
},
{
Description: "EmptyEnvValueOverridesDefault",
Expand All @@ -468,7 +471,7 @@ CMD echo $TEST_STRING
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("\n")),
Expected: test.Expects(0, nil, expect.Equals("\n")),
},
},
}
Expand Down Expand Up @@ -499,7 +502,7 @@ CMD ["echo", "nerdctl-build-test-string"]
return helpers.Command("run", "--rm", string(imageID))
},

Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
}

testCase.Run(t)
Expand All @@ -526,7 +529,7 @@ LABEL name=nerdctl-build-test-label
return helpers.Command("inspect", data.Identifier(), "--format", "{{json .Config.Labels }}")
},

Expected: test.Expects(0, nil, test.Equals("{\"label\":\"test\",\"name\":\"nerdctl-build-test-label\"}\n")),
Expected: test.Expects(0, nil, expect.Equals("{\"label\":\"test\",\"name\":\"nerdctl-build-test-label\"}\n")),
}

testCase.Run(t)
Expand Down Expand Up @@ -561,23 +564,23 @@ CMD ["echo", "nerdctl-build-test-string"]
return helpers.Command("run", "--rm", data.Get("i1"))
},

Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
},
{
Description: "i2",
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
return helpers.Command("run", "--rm", data.Get("i2"))
},

Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
},
{
Description: "i3",
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
return helpers.Command("run", "--rm", data.Get("i3"))
},

Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
},
},
}
Expand All @@ -589,9 +592,9 @@ func TestBuildWithContainerfile(t *testing.T) {
nerdtest.Setup()

testCase := &test.Case{
Require: test.Require(
Require: require.All(
nerdtest.Build,
test.Not(nerdtest.Docker),
require.Not(nerdtest.Docker),
),
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
Expand All @@ -608,7 +611,7 @@ CMD ["echo", "nerdctl-build-test-string"]
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
return helpers.Command("run", "--rm", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
}

testCase.Run(t)
Expand Down Expand Up @@ -639,7 +642,7 @@ CMD ["echo", "containerfile"]
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
return helpers.Command("run", "--rm", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("dockerfile\n")),
Expected: test.Expects(0, nil, expect.Equals("dockerfile\n")),
}

testCase.Run(t)
Expand All @@ -665,7 +668,7 @@ CMD ["echo", "nerdctl-build-test-string"]
helpers.Ensure("build", buildCtx)
},
Command: test.Command("images"),
Expected: test.Expects(0, nil, test.Contains("<none>")),
Expected: test.Expects(0, nil, expect.Contains("<none>")),
}

testCase.Run(t)
Expand Down Expand Up @@ -703,9 +706,9 @@ func TestBuildContextWithCopyFromDir(t *testing.T) {
filename := "hello.txt"

testCase := &test.Case{
Require: test.Require(
Require: require.All(
nerdtest.Build,
test.Not(nerdtest.Docker),
require.Not(nerdtest.Docker),
),
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
Expand Down Expand Up @@ -739,9 +742,9 @@ func TestBuildSourceDateEpoch(t *testing.T) {
nerdtest.Setup()

testCase := &test.Case{
Require: test.Require(
Require: require.All(
nerdtest.Build,
test.Not(nerdtest.Docker),
require.Not(nerdtest.Docker),
),
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
Expand Down Expand Up @@ -772,7 +775,7 @@ CMD ["cat", "/source-date-epoch"]
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
return helpers.Command("run", "--rm", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("1111111111\n")),
Expected: test.Expects(0, nil, expect.Equals("1111111111\n")),
},
{
Description: "2222222222",
Expand All @@ -788,7 +791,7 @@ CMD ["cat", "/source-date-epoch"]
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
return helpers.Command("run", "--rm", data.Identifier())
},
Expected: test.Expects(0, nil, test.Equals("2222222222\n")),
Expected: test.Expects(0, nil, expect.Equals("2222222222\n")),
},
},
}
Expand All @@ -800,9 +803,9 @@ func TestBuildNetwork(t *testing.T) {
nerdtest.Setup()

testCase := &test.Case{
Require: test.Require(
Require: require.All(
nerdtest.Build,
test.Not(nerdtest.Docker),
require.Not(nerdtest.Docker),
),
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rmi", "-f", data.Identifier())
Expand Down Expand Up @@ -861,9 +864,9 @@ func TestBuildAttestation(t *testing.T) {
const testProvenanceFileName = "provenance.json"

testCase := &test.Case{
Require: test.Require(
Require: require.All(
nerdtest.Build,
test.Not(nerdtest.Docker),
require.Not(nerdtest.Docker),
),
Cleanup: func(data test.Data, helpers test.Helpers) {
if nerdtest.IsDocker() {
Expand Down Expand Up @@ -962,7 +965,7 @@ func TestBuildAddHost(t *testing.T) {
nerdtest.Setup()

testCase := &test.Case{
Require: test.Require(
Require: require.All(
nerdtest.Build,
),
Cleanup: func(data test.Data, helpers test.Helpers) {
Expand Down
10 changes: 6 additions & 4 deletions cmd/nerdctl/builder/builder_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,21 @@ import (

"gotest.tools/v3/assert"

"github.com/containerd/nerdctl/mod/tigron/require"
"github.com/containerd/nerdctl/mod/tigron/test"

"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
"github.com/containerd/nerdctl/v2/pkg/testutil/test"
)

func TestBuilder(t *testing.T) {
nerdtest.Setup()

testCase := &test.Case{
NoParallel: true,
Require: test.Require(
Require: require.All(
nerdtest.Build,
test.Not(test.Windows),
require.Not(require.Windows),
),
SubTests: []*test.Case{
{
Expand Down Expand Up @@ -72,7 +74,7 @@ CMD ["echo", "nerdctl-test-builder-prune"]`, testutil.CommonImage)
{
Description: "Debug",
// `nerdctl builder debug` is currently incompatible with `docker buildx debug`.
Require: test.Require(test.Not(nerdtest.Docker)),
Require: require.All(require.Not(nerdtest.Docker)),
NoParallel: true,
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
dockerfile := fmt.Sprintf(`FROM %s
Expand Down
Loading
Loading