Skip to content

Commit ce8e077

Browse files
apostasieapostasie
committed
Chores: spurious comments and syntax simplification
Signed-off-by: apostasie <[email protected]>
1 parent 1ab6df3 commit ce8e077

File tree

5 files changed

+3
-37
lines changed

5 files changed

+3
-37
lines changed

‎cmd/nerdctl/network/network_create_linux_test.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ func TestNetworkCreate(t *testing.T) {
3535
testCase.SubTests = []*test.Case{
3636
{
3737
Description: "vanilla",
38-
// #3491 and #3508 may have helped - commenting this out for now
39-
// Require: nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/3086"),
4038
Setup: func(data test.Data, helpers test.Helpers) {
4139
helpers.Ensure("network", "create", data.Identifier())
4240
netw := nerdtest.InspectNetwork(helpers, data.Identifier())
@@ -66,8 +64,6 @@ func TestNetworkCreate(t *testing.T) {
6664
},
6765
{
6866
Description: "with MTU",
69-
// #3491 and #3508 may have helped - commenting this out for now
70-
// Require: nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/3086"),
7167
Setup: func(data test.Data, helpers test.Helpers) {
7268
helpers.Ensure("network", "create", data.Identifier(), "--driver", "bridge", "--opt", "com.docker.network.driver.mtu=9216")
7369
},
@@ -81,9 +77,7 @@ func TestNetworkCreate(t *testing.T) {
8177
},
8278
{
8379
Description: "with ipv6",
84-
// #3491 and #3508 may have helped - commenting this out for now
85-
// Require: nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/3086"),
86-
Require: nerdtest.OnlyIPv6,
80+
Require: nerdtest.OnlyIPv6,
8781
Setup: func(data test.Data, helpers test.Helpers) {
8882
subnetStr := "2001:db8:8::/64"
8983
data.Set("subnetStr", subnetStr)

‎cmd/nerdctl/network/network_list_linux_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ import (
2929
func TestNetworkLsFilter(t *testing.T) {
3030
testCase := nerdtest.Setup()
3131

32-
// #3491 and #3508 may have helped - commenting this out for now
33-
// testCase.Require = nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/3086"),
34-
3532
testCase.Setup = func(data test.Data, helpers test.Helpers) {
3633
data.Set("identifier", data.Identifier())
3734
data.Set("label", "mylabel=label-1")

‎pkg/cmd/image/ensure.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ func ensureOne(ctx context.Context, client *containerd.Client, rawRef string, ta
6565
if err != nil {
6666
return err
6767
}
68-
// if platform == nil {
69-
// platform = platforms.DefaultSpec()
70-
//}
7168
pltf := []ocispec.Platform{platform}
7269
platformComparer := platformutil.NewMatchComparerFromOCISpecPlatformSlice(pltf)
7370

‎pkg/referenceutil/referenceutil_test.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ func TestReferenceUtil(t *testing.T) {
2727
needles := map[string]struct {
2828
Error string
2929
String string
30-
Normalized string
3130
Suggested string
3231
FamiliarName string
3332
FamiliarMatch map[string]bool
@@ -82,7 +81,6 @@ func TestReferenceUtil(t *testing.T) {
8281
"sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50": {
8382
Error: "",
8483
String: "sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50",
85-
Normalized: "sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50",
8684
Suggested: "untitled-abcde",
8785
FamiliarName: "",
8886
Protocol: "",
@@ -94,7 +92,6 @@ func TestReferenceUtil(t *testing.T) {
9492
"4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50": {
9593
Error: "",
9694
String: "sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50",
97-
Normalized: "sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50",
9895
Suggested: "untitled-abcde",
9996
FamiliarName: "",
10097
Protocol: "",
@@ -106,7 +103,6 @@ func TestReferenceUtil(t *testing.T) {
106103
"image_name": {
107104
Error: "",
108105
String: "docker.io/library/image_name:latest",
109-
Normalized: "docker.io/library/image_name:latest",
110106
Suggested: "image_name-abcde",
111107
FamiliarName: "image_name",
112108
Protocol: "",
@@ -119,7 +115,6 @@ func TestReferenceUtil(t *testing.T) {
119115
"library/image_name": {
120116
Error: "",
121117
String: "docker.io/library/image_name:latest",
122-
Normalized: "docker.io/library/image_name:latest",
123118
Suggested: "image_name-abcde",
124119
FamiliarName: "image_name",
125120
Protocol: "",
@@ -132,7 +127,6 @@ func TestReferenceUtil(t *testing.T) {
132127
"something/image_name": {
133128
Error: "",
134129
String: "docker.io/something/image_name:latest",
135-
Normalized: "docker.io/something/image_name:latest",
136130
Suggested: "image_name-abcde",
137131
FamiliarName: "something/image_name",
138132
Protocol: "",
@@ -145,7 +139,6 @@ func TestReferenceUtil(t *testing.T) {
145139
"docker.io/library/image_name": {
146140
Error: "",
147141
String: "docker.io/library/image_name:latest",
148-
Normalized: "docker.io/library/image_name:latest",
149142
Suggested: "image_name-abcde",
150143
FamiliarName: "image_name",
151144
Protocol: "",
@@ -158,7 +151,6 @@ func TestReferenceUtil(t *testing.T) {
158151
"image_name:latest": {
159152
Error: "",
160153
String: "docker.io/library/image_name:latest",
161-
Normalized: "docker.io/library/image_name:latest",
162154
Suggested: "image_name-abcde",
163155
FamiliarName: "image_name",
164156
Protocol: "",
@@ -171,7 +163,6 @@ func TestReferenceUtil(t *testing.T) {
171163
"image_name:foo": {
172164
Error: "",
173165
String: "docker.io/library/image_name:foo",
174-
Normalized: "docker.io/library/image_name:foo",
175166
Suggested: "image_name-abcde",
176167
FamiliarName: "image_name",
177168
Protocol: "",
@@ -184,7 +175,6 @@ func TestReferenceUtil(t *testing.T) {
184175
"image_name@sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50": {
185176
Error: "",
186177
String: "docker.io/library/image_name@sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50",
187-
Normalized: "docker.io/library/image_name@sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50",
188178
Suggested: "image_name-abcde",
189179
FamiliarName: "image_name",
190180
Protocol: "",
@@ -197,7 +187,6 @@ func TestReferenceUtil(t *testing.T) {
197187
"image_name:latest@sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50": {
198188
Error: "",
199189
String: "docker.io/library/image_name:latest@sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50",
200-
Normalized: "docker.io/library/image_name:latest@sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50",
201190
Suggested: "image_name-abcde",
202191
FamiliarName: "image_name",
203192
Protocol: "",
@@ -210,7 +199,6 @@ func TestReferenceUtil(t *testing.T) {
210199
"ghcr.io:1234/image_name": {
211200
Error: "",
212201
String: "ghcr.io:1234/image_name:latest",
213-
Normalized: "ghcr.io:1234/image_name:latest",
214202
Suggested: "image_name-abcde",
215203
FamiliarName: "ghcr.io:1234/image_name",
216204
Protocol: "",
@@ -223,7 +211,6 @@ func TestReferenceUtil(t *testing.T) {
223211
"ghcr.io/sub_name/image_name": {
224212
Error: "",
225213
String: "ghcr.io/sub_name/image_name:latest",
226-
Normalized: "ghcr.io/sub_name/image_name:latest",
227214
Suggested: "image_name-abcde",
228215
FamiliarName: "ghcr.io/sub_name/image_name",
229216
Protocol: "",
@@ -236,7 +223,6 @@ func TestReferenceUtil(t *testing.T) {
236223
"bafkreicq4dg6nkef5ju422ptedcwfz6kcvpvvhuqeykfrwq5krazf3muze": {
237224
Error: "",
238225
String: "bafkreicq4dg6nkef5ju422ptedcwfz6kcvpvvhuqeykfrwq5krazf3muze",
239-
Normalized: "bafkreicq4dg6nkef5ju422ptedcwfz6kcvpvvhuqeykfrwq5krazf3muze",
240226
Suggested: "ipfs-bafkr-abcde",
241227
FamiliarName: "bafkreicq4dg6nkef5ju422ptedcwfz6kcvpvvhuqeykfrwq5krazf3muze",
242228
Protocol: "ipfs",
@@ -249,7 +235,6 @@ func TestReferenceUtil(t *testing.T) {
249235
"ipfs://bafkreicq4dg6nkef5ju422ptedcwfz6kcvpvvhuqeykfrwq5krazf3muze": {
250236
Error: "",
251237
String: "bafkreicq4dg6nkef5ju422ptedcwfz6kcvpvvhuqeykfrwq5krazf3muze",
252-
Normalized: "bafkreicq4dg6nkef5ju422ptedcwfz6kcvpvvhuqeykfrwq5krazf3muze",
253238
Suggested: "ipfs-bafkr-abcde",
254239
FamiliarName: "bafkreicq4dg6nkef5ju422ptedcwfz6kcvpvvhuqeykfrwq5krazf3muze",
255240
Protocol: "ipfs",
@@ -262,7 +247,6 @@ func TestReferenceUtil(t *testing.T) {
262247
"ipfs://ghcr.io/stargz-containers/alpine:3.13-org": {
263248
Error: "",
264249
String: "ghcr.io/stargz-containers/alpine:3.13-org",
265-
Normalized: "ghcr.io/stargz-containers/alpine:3.13-org",
266250
Suggested: "alpine-abcde",
267251
FamiliarName: "ghcr.io/stargz-containers/alpine",
268252
FamiliarMatch: map[string]bool{
@@ -280,7 +264,6 @@ func TestReferenceUtil(t *testing.T) {
280264
"ipfs://alpine": {
281265
Error: "",
282266
String: "docker.io/library/alpine:latest",
283-
Normalized: "docker.io/library/alpine:latest",
284267
Suggested: "alpine-abcde",
285268
FamiliarName: "alpine",
286269
Protocol: "ipfs",

‎pkg/testutil/testutil.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,7 @@ func (b *Base) EnsureDaemonActive() {
180180
sleep = 3 * time.Second
181181
)
182182
for i := 0; i < maxRetry; i++ {
183-
cmd := exec.Command("systemctl",
184-
append(systemctlArgs,
185-
[]string{"is-active", target}...)...)
183+
cmd := exec.Command("systemctl", append(systemctlArgs, "is-active", target)...)
186184
out, err := cmd.CombinedOutput()
187185
b.T.Logf("(retry=%d) %s", i, string(out))
188186
if err == nil {
@@ -204,10 +202,7 @@ func (b *Base) DumpDaemonLogs(minutes int) {
204202
b.T.Helper()
205203
target := b.systemctlTarget()
206204
cmd := exec.Command("journalctl",
207-
append(b.systemctlArgs(),
208-
[]string{"-u", target,
209-
"--no-pager",
210-
"-S", fmt.Sprintf("%d min ago", minutes)}...)...)
205+
append(b.systemctlArgs(), "-u", target, "--no-pager", "-S", fmt.Sprintf("%d min ago", minutes))...)
211206
b.T.Logf("===== %v =====", cmd.Args)
212207
out, err := cmd.CombinedOutput()
213208
if err != nil {

0 commit comments

Comments
 (0)