From 05918629dd0c66bbdaa405eb0013ff4f9a0f989f Mon Sep 17 00:00:00 2001 From: apostasie Date: Sun, 20 Oct 2024 13:15:34 -0700 Subject: [PATCH] Remove no-op description from top-level tests Signed-off-by: apostasie --- cmd/nerdctl/image/image_convert_linux_test.go | 2 -- cmd/nerdctl/image/image_list_test.go | 6 ++---- cmd/nerdctl/image/image_pull_linux_test.go | 3 --- cmd/nerdctl/image/image_push_linux_test.go | 2 -- cmd/nerdctl/image/image_save_test.go | 3 +-- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/cmd/nerdctl/image/image_convert_linux_test.go b/cmd/nerdctl/image/image_convert_linux_test.go index 85f0e243eaa..3a202a818ef 100644 --- a/cmd/nerdctl/image/image_convert_linux_test.go +++ b/cmd/nerdctl/image/image_convert_linux_test.go @@ -30,7 +30,6 @@ func TestImageConvert(t *testing.T) { nerdtest.Setup() testCase := &test.Case{ - Description: "Test image conversion", Require: test.Require( test.Not(test.Windows), test.Not(nerdtest.Docker), @@ -101,7 +100,6 @@ func TestImageConvertNydusVerify(t *testing.T) { var registry *testregistry.RegistryServer testCase := &test.Case{ - Description: "TestImageConvertNydusVerify", Require: test.Require( test.Linux, test.Binary("nydus-image"), diff --git a/cmd/nerdctl/image/image_list_test.go b/cmd/nerdctl/image/image_list_test.go index e89b2d44230..6aae9354a90 100644 --- a/cmd/nerdctl/image/image_list_test.go +++ b/cmd/nerdctl/image/image_list_test.go @@ -37,8 +37,7 @@ func TestImages(t *testing.T) { nerdtest.Setup() testCase := &test.Case{ - Description: "TestImages", - Require: test.Not(nerdtest.Docker), + Require: test.Not(nerdtest.Docker), Setup: func(data test.Data, helpers test.Helpers) { helpers.Ensure("pull", "--quiet", testutil.CommonImage) helpers.Ensure("pull", "--quiet", testutil.NginxAlpineImage) @@ -133,8 +132,7 @@ func TestImagesFilter(t *testing.T) { nerdtest.Setup() testCase := &test.Case{ - Description: "TestImagesFilter", - Require: nerdtest.Build, + Require: nerdtest.Build, Setup: func(data test.Data, helpers test.Helpers) { helpers.Ensure("pull", "--quiet", testutil.CommonImage) helpers.Ensure("tag", testutil.CommonImage, "taggedimage:one-fragment-one") diff --git a/cmd/nerdctl/image/image_pull_linux_test.go b/cmd/nerdctl/image/image_pull_linux_test.go index d2d624671fd..611c834b2ed 100644 --- a/cmd/nerdctl/image/image_pull_linux_test.go +++ b/cmd/nerdctl/image/image_pull_linux_test.go @@ -38,7 +38,6 @@ func TestImagePullWithCosign(t *testing.T) { var keyPair *testhelpers.CosignKeyPair testCase := &test.Case{ - Description: "TestImagePullWithCosign", Require: test.Require( test.Linux, nerdtest.Build, @@ -107,7 +106,6 @@ func TestImagePullPlainHttpWithDefaultPort(t *testing.T) { var registry *testregistry.RegistryServer testCase := &test.Case{ - Description: "TestImagePullPlainHttpWithDefaultPort", Require: test.Require( test.Linux, test.Not(nerdtest.Docker), @@ -150,7 +148,6 @@ func TestImagePullSoci(t *testing.T) { nerdtest.Setup() testCase := &test.Case{ - Description: "TestImagePullSoci", Require: test.Require( test.Linux, test.Not(nerdtest.Docker), diff --git a/cmd/nerdctl/image/image_push_linux_test.go b/cmd/nerdctl/image/image_push_linux_test.go index 11dac1f8b3d..791141876ee 100644 --- a/cmd/nerdctl/image/image_push_linux_test.go +++ b/cmd/nerdctl/image/image_push_linux_test.go @@ -37,8 +37,6 @@ func TestPush(t *testing.T) { var registryNoAuthHTTPRandom, registryNoAuthHTTPDefault, registryTokenAuthHTTPSRandom *testregistry.RegistryServer testCase := &test.Case{ - Description: "Test push", - Require: test.Linux, Setup: func(data test.Data, helpers test.Helpers) { diff --git a/cmd/nerdctl/image/image_save_test.go b/cmd/nerdctl/image/image_save_test.go index eb2617a1eb3..90aa59909d2 100644 --- a/cmd/nerdctl/image/image_save_test.go +++ b/cmd/nerdctl/image/image_save_test.go @@ -35,8 +35,7 @@ func TestSaveContent(t *testing.T) { nerdtest.Setup() testCase := &test.Case{ - Description: "Test content (linux only)", - Require: test.Not(test.Windows), + Require: test.Not(test.Windows), Setup: func(data test.Data, helpers test.Helpers) { helpers.Ensure("pull", "--quiet", testutil.CommonImage) },