Skip to content

Commit 23e58ba

Browse files
apostasieapostasie
committed
Enable tests to run on windows
Signed-off-by: apostasie <[email protected]>
1 parent 2b3624e commit 23e58ba

File tree

3 files changed

+37
-31
lines changed

3 files changed

+37
-31
lines changed

‎cmd/nerdctl/image/image_remove_test.go

+10-20
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@ func TestRemove(t *testing.T) {
4343
Description: "Remove image with stopped container - without -f",
4444
NoParallel: true,
4545
Require: test.Require(
46-
test.Not(test.Windows),
4746
test.Not(nerdtest.Docker),
4847
),
4948
Setup: func(data test.Data, helpers test.Helpers) {
50-
helpers.Ensure("run", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage)
49+
helpers.Ensure("run", "--name", data.Identifier(), testutil.CommonImage)
5150
},
5251
Cleanup: func(data test.Data, helpers test.Helpers) {
5352
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -68,9 +67,8 @@ func TestRemove(t *testing.T) {
6867
{
6968
Description: "Remove image with stopped container - with -f",
7069
NoParallel: true,
71-
Require: test.Not(test.Windows),
7270
Setup: func(data test.Data, helpers test.Helpers) {
73-
helpers.Ensure("run", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage)
71+
helpers.Ensure("run", "--name", data.Identifier(), testutil.CommonImage)
7472
},
7573
Cleanup: func(data test.Data, helpers test.Helpers) {
7674
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -90,11 +88,10 @@ func TestRemove(t *testing.T) {
9088
Description: "Remove image with running container - without -f",
9189
NoParallel: true,
9290
Require: test.Require(
93-
test.Not(test.Windows),
9491
test.Not(nerdtest.Docker),
9592
),
9693
Setup: func(data test.Data, helpers test.Helpers) {
97-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
94+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
9895
},
9996
Cleanup: func(data test.Data, helpers test.Helpers) {
10097
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -121,11 +118,10 @@ func TestRemove(t *testing.T) {
121118
// untags `imageName` (left a `<none>` image) without deletion; `docker rmi -rf imageID` fails.
122119
// In both cases, `nerdctl rmi -f` will fail.
123120
Require: test.Require(
124-
test.Not(test.Windows),
125121
test.Not(nerdtest.Docker),
126122
),
127123
Setup: func(data test.Data, helpers test.Helpers) {
128-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
124+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
129125
},
130126
Cleanup: func(data test.Data, helpers test.Helpers) {
131127
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -146,9 +142,8 @@ func TestRemove(t *testing.T) {
146142
{
147143
Description: "Remove image with created container - without -f",
148144
NoParallel: true,
149-
Require: test.Not(test.Windows),
150145
Setup: func(data test.Data, helpers test.Helpers) {
151-
helpers.Ensure("create", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
146+
helpers.Ensure("create", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
152147
},
153148
Cleanup: func(data test.Data, helpers test.Helpers) {
154149
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -167,10 +162,9 @@ func TestRemove(t *testing.T) {
167162
{
168163
Description: "Remove image with created container - with -f",
169164
NoParallel: true,
170-
Require: test.Not(test.Windows),
171165
Setup: func(data test.Data, helpers test.Helpers) {
172166
helpers.Ensure("pull", "--quiet", testutil.NginxAlpineImage)
173-
helpers.Ensure("create", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
167+
helpers.Ensure("create", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
174168
helpers.Ensure("rmi", testutil.NginxAlpineImage)
175169
},
176170
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -195,12 +189,11 @@ func TestRemove(t *testing.T) {
195189
Description: "Remove image with paused container - without -f",
196190
NoParallel: true,
197191
Require: test.Require(
198-
test.Not(test.Windows),
199192
test.Not(nerdtest.Docker),
200193
nerdtest.CGroup,
201194
),
202195
Setup: func(data test.Data, helpers test.Helpers) {
203-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
196+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
204197
helpers.Ensure("pause", data.Identifier())
205198
},
206199
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -223,7 +216,6 @@ func TestRemove(t *testing.T) {
223216
Description: "Remove image with paused container - with -f",
224217
NoParallel: true,
225218
Require: test.Require(
226-
test.Not(test.Windows),
227219
nerdtest.CGroup,
228220
// FIXME: nerdctl is broken
229221
// https://github.com/containerd/nerdctl/issues/3454
@@ -233,7 +225,7 @@ func TestRemove(t *testing.T) {
233225
test.Not(nerdtest.Docker),
234226
),
235227
Setup: func(data test.Data, helpers test.Helpers) {
236-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
228+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
237229
helpers.Ensure("pause", data.Identifier())
238230
},
239231
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -256,11 +248,10 @@ func TestRemove(t *testing.T) {
256248
Description: "Remove image with killed container - without -f",
257249
NoParallel: true,
258250
Require: test.Require(
259-
test.Not(test.Windows),
260251
test.Not(nerdtest.Docker),
261252
),
262253
Setup: func(data test.Data, helpers test.Helpers) {
263-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
254+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
264255
helpers.Ensure("kill", data.Identifier())
265256
},
266257
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -282,9 +273,8 @@ func TestRemove(t *testing.T) {
282273
{
283274
Description: "Remove image with killed container - with -f",
284275
NoParallel: true,
285-
Require: test.Not(test.Windows),
286276
Setup: func(data test.Data, helpers test.Helpers) {
287-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
277+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
288278
helpers.Ensure("kill", data.Identifier())
289279
},
290280
Cleanup: func(data test.Data, helpers test.Helpers) {

‎cmd/nerdctl/issues/main_linux_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@ func TestMain(m *testing.M) {
3333
func TestIssue108(t *testing.T) {
3434
testCase := nerdtest.Setup()
3535

36-
testCase.Require = test.Linux
37-
3836
testCase.SubTests = []*test.Case{
3937
{
4038
Description: "-it --net=host",
4139
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
42-
cmd := helpers.Command("run", "-it", "--rm", "--net=host", testutil.AlpineImage, "echo", "this was always working")
40+
cmd := helpers.Command("run", "-it", "--rm", "--net=host", testutil.CommonImage, "echo", "this was always working")
4341
cmd.WithPseudoTTY()
4442
return cmd
4543
},
@@ -48,7 +46,7 @@ func TestIssue108(t *testing.T) {
4846
{
4947
Description: "--net=host -it",
5048
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
51-
cmd := helpers.Command("run", "--rm", "--net=host", "-it", testutil.AlpineImage, "echo", "this was not working due to issue #108")
49+
cmd := helpers.Command("run", "--rm", "--net=host", "-it", testutil.CommonImage, "echo", "this was not working due to issue #108")
5250
cmd.WithPseudoTTY()
5351
return cmd
5452
},

‎cmd/nerdctl/network/network_inspect_test.go

+25-7
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ func TestNetworkInspect(t *testing.T) {
3838
testIPRange = "10.24.24.0/25"
3939
)
4040

41+
testCase.Setup = func(data test.Data, helpers test.Helpers) {
42+
helpers.Ensure("network", "create", data.Identifier("basenet"))
43+
data.Set("basenet", data.Identifier("basenet"))
44+
}
45+
46+
testCase.Cleanup = func(data test.Data, helpers test.Helpers) {
47+
helpers.Anyhow("network", "rm", data.Identifier("basenet"))
48+
}
49+
4150
testCase.SubTests = []*test.Case{
4251
{
4352
Description: "non existent network",
@@ -87,6 +96,18 @@ func TestNetworkInspect(t *testing.T) {
8796
assert.Equal(t, dc[0].Name, "bridge")
8897
}),
8998
},
99+
{
100+
Description: "nat",
101+
Require: test.Windows,
102+
Command: test.Command("network", "inspect", "nat"),
103+
Expected: test.Expects(0, nil, func(stdout string, info string, t *testing.T) {
104+
var dc []dockercompat.Network
105+
err := json.Unmarshal([]byte(stdout), &dc)
106+
assert.NilError(t, err, "Unable to unmarshal output\n"+info)
107+
assert.Equal(t, 1, len(dc), "Unexpectedly got multiple results\n"+info)
108+
assert.Equal(t, dc[0].Name, "nat")
109+
}),
110+
},
90111
{
91112
Description: "custom",
92113
Setup: func(data test.Data, helpers test.Helpers) {
@@ -106,9 +127,8 @@ func TestNetworkInspect(t *testing.T) {
106127
},
107128
{
108129
Description: "match exact id",
109-
Require: test.Not(test.Windows),
110130
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
111-
id := strings.TrimSpace(helpers.Capture("network", "inspect", "bridge", "--format", "{{ .Id }}"))
131+
id := strings.TrimSpace(helpers.Capture("network", "inspect", data.Get("basenet"), "--format", "{{ .Id }}"))
112132
return helpers.Command("network", "inspect", id)
113133
},
114134
Expected: test.Expects(0, nil, func(stdout string, info string, t *testing.T) {
@@ -121,9 +141,8 @@ func TestNetworkInspect(t *testing.T) {
121141
},
122142
{
123143
Description: "match part of id",
124-
Require: test.Not(test.Windows),
125144
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
126-
id := strings.TrimSpace(helpers.Capture("network", "inspect", "bridge", "--format", "{{ .Id }}"))
145+
id := strings.TrimSpace(helpers.Capture("network", "inspect", data.Get("basenet"), "--format", "{{ .Id }}"))
127146
return helpers.Command("network", "inspect", id[0:25])
128147
},
129148
Expected: test.Expects(0, nil, func(stdout string, info string, t *testing.T) {
@@ -136,14 +155,13 @@ func TestNetworkInspect(t *testing.T) {
136155
},
137156
{
138157
Description: "using another net short id",
139-
Require: test.Not(test.Windows),
140158
Setup: func(data test.Data, helpers test.Helpers) {
141-
id := strings.TrimSpace(helpers.Capture("network", "inspect", "bridge", "--format", "{{ .Id }}"))
159+
id := strings.TrimSpace(helpers.Capture("network", "inspect", data.Get("basenet"), "--format", "{{ .Id }}"))
142160
helpers.Ensure("network", "create", id[0:12])
143161
data.Set("netname", id[0:12])
144162
},
145163
Cleanup: func(data test.Data, helpers test.Helpers) {
146-
id := strings.TrimSpace(helpers.Capture("network", "inspect", "bridge", "--format", "{{ .Id }}"))
164+
id := strings.TrimSpace(helpers.Capture("network", "inspect", data.Get("basenet"), "--format", "{{ .Id }}"))
147165
helpers.Anyhow("network", "remove", id[0:12])
148166
},
149167
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {

0 commit comments

Comments
 (0)