Skip to content

Commit 7363284

Browse files
apostasieapostasie
committed
Reorg test package
Signed-off-by: apostasie <[email protected]>
1 parent a41022c commit 7363284

File tree

105 files changed

+1031
-716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1031
-716
lines changed

‎cmd/nerdctl/builder/builder_build_oci_layout_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ import (
2525

2626
"gotest.tools/v3/assert"
2727

28+
"github.com/containerd/nerdctl/mod/tigron/require"
29+
"github.com/containerd/nerdctl/mod/tigron/test"
30+
2831
"github.com/containerd/nerdctl/v2/pkg/testutil"
2932
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
30-
"github.com/containerd/nerdctl/v2/pkg/testutil/test"
3133
)
3234

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

3840
testCase := &test.Case{
39-
Require: test.Require(
41+
Require: require.All(
4042
nerdtest.Build,
41-
test.Not(test.Windows),
43+
require.Not(require.Windows),
4244
),
4345
Cleanup: func(data test.Data, helpers test.Helpers) {
4446
if nerdtest.IsDocker() {

‎cmd/nerdctl/builder/builder_build_test.go‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@ import (
2727

2828
"gotest.tools/v3/assert"
2929

30+
"github.com/containerd/nerdctl/mod/tigron/expect"
31+
"github.com/containerd/nerdctl/mod/tigron/require"
32+
"github.com/containerd/nerdctl/mod/tigron/test"
33+
3034
"github.com/containerd/nerdctl/v2/pkg/platformutil"
3135
"github.com/containerd/nerdctl/v2/pkg/testutil"
3236
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
33-
"github.com/containerd/nerdctl/v2/pkg/testutil/test"
3437
)
3538

3639
func TestBuildBasics(t *testing.T) {
@@ -60,7 +63,7 @@ CMD ["echo", "nerdctl-build-test-string"]`, testutil.CommonImage)
6063
Cleanup: func(data test.Data, helpers test.Helpers) {
6164
helpers.Anyhow("rmi", "-f", data.Identifier())
6265
},
63-
Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
66+
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
6467
},
6568
{
6669
Description: "Successfully build with 'buildctx first', 'tag second'",
@@ -73,7 +76,7 @@ CMD ["echo", "nerdctl-build-test-string"]`, testutil.CommonImage)
7376
Cleanup: func(data test.Data, helpers test.Helpers) {
7477
helpers.Anyhow("rmi", "-f", data.Identifier())
7578
},
76-
Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
79+
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
7780
},
7881
{
7982
Description: "Successfully build with output docker, main tag still works",
@@ -86,7 +89,7 @@ CMD ["echo", "nerdctl-build-test-string"]`, testutil.CommonImage)
8689
Cleanup: func(data test.Data, helpers test.Helpers) {
8790
helpers.Anyhow("rmi", "-f", data.Identifier())
8891
},
89-
Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
92+
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
9093
},
9194
{
9295
Description: "Successfully build with output docker, name cannot be used",
@@ -126,7 +129,7 @@ func TestCanBuildOnOtherPlatform(t *testing.T) {
126129
}
127130

128131
testCase := &test.Case{
129-
Require: test.Require(
132+
Require: require.All(
130133
nerdtest.Build,
131134
requireEmulation,
132135
),
@@ -179,7 +182,7 @@ CMD ["cat", "/hello2"]`, data.Identifier("first"))
179182
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
180183
return helpers.Command("run", "--rm", data.Identifier("second"))
181184
},
182-
Expected: test.Expects(0, nil, test.Equals("hello2\n")),
185+
Expected: test.Expects(0, nil, expect.Equals("hello2\n")),
183186
}
184187

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

193196
testCase := &test.Case{
194-
Require: test.Require(
197+
Require: require.All(
195198
nerdtest.Build,
196-
test.Not(nerdtest.Docker),
199+
require.Not(nerdtest.Docker),
197200
),
198201
Cleanup: func(data test.Data, helpers test.Helpers) {
199202
helpers.Anyhow("rmi", "-f", data.Identifier("first"))
@@ -213,7 +216,7 @@ CMD ["cat", "/hello2"]`, data.Identifier("first"))
213216
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
214217
return helpers.Command("run", "--rm", data.Identifier("second"))
215218
},
216-
Expected: test.Expects(0, nil, test.Equals("hello2\n")),
219+
Expected: test.Expects(0, nil, expect.Equals("hello2\n")),
217220
}
218221

219222
testCase.Run(t)
@@ -397,7 +400,7 @@ CMD echo $TEST_STRING
397400
Cleanup: func(data test.Data, helpers test.Helpers) {
398401
helpers.Anyhow("rmi", "-f", data.Identifier())
399402
},
400-
Expected: test.Expects(0, nil, test.Equals("1\n")),
403+
Expected: test.Expects(0, nil, expect.Equals("1\n")),
401404
},
402405
{
403406
Description: "ArgValueOverridesDefault",
@@ -410,7 +413,7 @@ CMD echo $TEST_STRING
410413
Cleanup: func(data test.Data, helpers test.Helpers) {
411414
helpers.Anyhow("rmi", "-f", data.Identifier())
412415
},
413-
Expected: test.Expects(0, nil, test.Equals("2\n")),
416+
Expected: test.Expects(0, nil, expect.Equals("2\n")),
414417
},
415418
{
416419
Description: "EmptyArgValueOverridesDefault",
@@ -423,7 +426,7 @@ CMD echo $TEST_STRING
423426
Cleanup: func(data test.Data, helpers test.Helpers) {
424427
helpers.Anyhow("rmi", "-f", data.Identifier())
425428
},
426-
Expected: test.Expects(0, nil, test.Equals("\n")),
429+
Expected: test.Expects(0, nil, expect.Equals("\n")),
427430
},
428431
{
429432
Description: "UnsetArgKeyPreservesDefault",
@@ -436,7 +439,7 @@ CMD echo $TEST_STRING
436439
Cleanup: func(data test.Data, helpers test.Helpers) {
437440
helpers.Anyhow("rmi", "-f", data.Identifier())
438441
},
439-
Expected: test.Expects(0, nil, test.Equals("1\n")),
442+
Expected: test.Expects(0, nil, expect.Equals("1\n")),
440443
},
441444
{
442445
Description: "EnvValueOverridesDefault",
@@ -452,7 +455,7 @@ CMD echo $TEST_STRING
452455
Cleanup: func(data test.Data, helpers test.Helpers) {
453456
helpers.Anyhow("rmi", "-f", data.Identifier())
454457
},
455-
Expected: test.Expects(0, nil, test.Equals("3\n")),
458+
Expected: test.Expects(0, nil, expect.Equals("3\n")),
456459
},
457460
{
458461
Description: "EmptyEnvValueOverridesDefault",
@@ -468,7 +471,7 @@ CMD echo $TEST_STRING
468471
Cleanup: func(data test.Data, helpers test.Helpers) {
469472
helpers.Anyhow("rmi", "-f", data.Identifier())
470473
},
471-
Expected: test.Expects(0, nil, test.Equals("\n")),
474+
Expected: test.Expects(0, nil, expect.Equals("\n")),
472475
},
473476
},
474477
}
@@ -499,7 +502,7 @@ CMD ["echo", "nerdctl-build-test-string"]
499502
return helpers.Command("run", "--rm", string(imageID))
500503
},
501504

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

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

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

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

564-
Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
567+
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
565568
},
566569
{
567570
Description: "i2",
568571
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
569572
return helpers.Command("run", "--rm", data.Get("i2"))
570573
},
571574

572-
Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
575+
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
573576
},
574577
{
575578
Description: "i3",
576579
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
577580
return helpers.Command("run", "--rm", data.Get("i3"))
578581
},
579582

580-
Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
583+
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
581584
},
582585
},
583586
}
@@ -589,9 +592,9 @@ func TestBuildWithContainerfile(t *testing.T) {
589592
nerdtest.Setup()
590593

591594
testCase := &test.Case{
592-
Require: test.Require(
595+
Require: require.All(
593596
nerdtest.Build,
594-
test.Not(nerdtest.Docker),
597+
require.Not(nerdtest.Docker),
595598
),
596599
Cleanup: func(data test.Data, helpers test.Helpers) {
597600
helpers.Anyhow("rmi", "-f", data.Identifier())
@@ -608,7 +611,7 @@ CMD ["echo", "nerdctl-build-test-string"]
608611
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
609612
return helpers.Command("run", "--rm", data.Identifier())
610613
},
611-
Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
614+
Expected: test.Expects(0, nil, expect.Equals("nerdctl-build-test-string\n")),
612615
}
613616

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

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

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

705708
testCase := &test.Case{
706-
Require: test.Require(
709+
Require: require.All(
707710
nerdtest.Build,
708-
test.Not(nerdtest.Docker),
711+
require.Not(nerdtest.Docker),
709712
),
710713
Cleanup: func(data test.Data, helpers test.Helpers) {
711714
helpers.Anyhow("rmi", "-f", data.Identifier())
@@ -739,9 +742,9 @@ func TestBuildSourceDateEpoch(t *testing.T) {
739742
nerdtest.Setup()
740743

741744
testCase := &test.Case{
742-
Require: test.Require(
745+
Require: require.All(
743746
nerdtest.Build,
744-
test.Not(nerdtest.Docker),
747+
require.Not(nerdtest.Docker),
745748
),
746749
Cleanup: func(data test.Data, helpers test.Helpers) {
747750
helpers.Anyhow("rmi", "-f", data.Identifier())
@@ -772,7 +775,7 @@ CMD ["cat", "/source-date-epoch"]
772775
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
773776
return helpers.Command("run", "--rm", data.Identifier())
774777
},
775-
Expected: test.Expects(0, nil, test.Equals("1111111111\n")),
778+
Expected: test.Expects(0, nil, expect.Equals("1111111111\n")),
776779
},
777780
{
778781
Description: "2222222222",
@@ -788,7 +791,7 @@ CMD ["cat", "/source-date-epoch"]
788791
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
789792
return helpers.Command("run", "--rm", data.Identifier())
790793
},
791-
Expected: test.Expects(0, nil, test.Equals("2222222222\n")),
794+
Expected: test.Expects(0, nil, expect.Equals("2222222222\n")),
792795
},
793796
},
794797
}
@@ -800,9 +803,9 @@ func TestBuildNetwork(t *testing.T) {
800803
nerdtest.Setup()
801804

802805
testCase := &test.Case{
803-
Require: test.Require(
806+
Require: require.All(
804807
nerdtest.Build,
805-
test.Not(nerdtest.Docker),
808+
require.Not(nerdtest.Docker),
806809
),
807810
Cleanup: func(data test.Data, helpers test.Helpers) {
808811
helpers.Anyhow("rmi", "-f", data.Identifier())
@@ -861,9 +864,9 @@ func TestBuildAttestation(t *testing.T) {
861864
const testProvenanceFileName = "provenance.json"
862865

863866
testCase := &test.Case{
864-
Require: test.Require(
867+
Require: require.All(
865868
nerdtest.Build,
866-
test.Not(nerdtest.Docker),
869+
require.Not(nerdtest.Docker),
867870
),
868871
Cleanup: func(data test.Data, helpers test.Helpers) {
869872
if nerdtest.IsDocker() {
@@ -962,7 +965,7 @@ func TestBuildAddHost(t *testing.T) {
962965
nerdtest.Setup()
963966

964967
testCase := &test.Case{
965-
Require: test.Require(
968+
Require: require.All(
966969
nerdtest.Build,
967970
),
968971
Cleanup: func(data test.Data, helpers test.Helpers) {

‎cmd/nerdctl/builder/builder_builder_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,21 @@ import (
2626

2727
"gotest.tools/v3/assert"
2828

29+
"github.com/containerd/nerdctl/mod/tigron/require"
30+
"github.com/containerd/nerdctl/mod/tigron/test"
31+
2932
"github.com/containerd/nerdctl/v2/pkg/testutil"
3033
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
31-
"github.com/containerd/nerdctl/v2/pkg/testutil/test"
3234
)
3335

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

3739
testCase := &test.Case{
3840
NoParallel: true,
39-
Require: test.Require(
41+
Require: require.All(
4042
nerdtest.Build,
41-
test.Not(test.Windows),
43+
require.Not(require.Windows),
4244
),
4345
SubTests: []*test.Case{
4446
{
@@ -72,7 +74,7 @@ CMD ["echo", "nerdctl-test-builder-prune"]`, testutil.CommonImage)
7274
{
7375
Description: "Debug",
7476
// `nerdctl builder debug` is currently incompatible with `docker buildx debug`.
75-
Require: test.Require(test.Not(nerdtest.Docker)),
77+
Require: require.All(require.Not(nerdtest.Docker)),
7678
NoParallel: true,
7779
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
7880
dockerfile := fmt.Sprintf(`FROM %s

0 commit comments

Comments
 (0)