Skip to content

Commit 1eebc48

Browse files
apostasieapostasie
committed
Enable tests to run on windows
Signed-off-by: apostasie <[email protected]>
1 parent 62d0266 commit 1eebc48

File tree

3 files changed

+37
-31
lines changed

3 files changed

+37
-31
lines changed

‎cmd/nerdctl/image/image_remove_test.go

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ func TestRemove(t *testing.T) {
4040
Description: "Remove image with stopped container - without -f",
4141
NoParallel: true,
4242
Require: test.Require(
43-
test.Not(test.Windows),
4443
test.Not(nerdtest.Docker),
4544
),
4645
Setup: func(data test.Data, helpers test.Helpers) {
47-
helpers.Ensure("run", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage)
46+
helpers.Ensure("run", "--name", data.Identifier(), testutil.CommonImage)
4847
},
4948
Cleanup: func(data test.Data, helpers test.Helpers) {
5049
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -65,9 +64,8 @@ func TestRemove(t *testing.T) {
6564
{
6665
Description: "Remove image with stopped container - with -f",
6766
NoParallel: true,
68-
Require: test.Not(test.Windows),
6967
Setup: func(data test.Data, helpers test.Helpers) {
70-
helpers.Ensure("run", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage)
68+
helpers.Ensure("run", "--name", data.Identifier(), testutil.CommonImage)
7169
},
7270
Cleanup: func(data test.Data, helpers test.Helpers) {
7371
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -87,11 +85,10 @@ func TestRemove(t *testing.T) {
8785
Description: "Remove image with running container - without -f",
8886
NoParallel: true,
8987
Require: test.Require(
90-
test.Not(test.Windows),
9188
test.Not(nerdtest.Docker),
9289
),
9390
Setup: func(data test.Data, helpers test.Helpers) {
94-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
91+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
9592
},
9693
Cleanup: func(data test.Data, helpers test.Helpers) {
9794
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -118,11 +115,10 @@ func TestRemove(t *testing.T) {
118115
// untags `imageName` (left a `<none>` image) without deletion; `docker rmi -rf imageID` fails.
119116
// In both cases, `nerdctl rmi -f` will fail.
120117
Require: test.Require(
121-
test.Not(test.Windows),
122118
test.Not(nerdtest.Docker),
123119
),
124120
Setup: func(data test.Data, helpers test.Helpers) {
125-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
121+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
126122
},
127123
Cleanup: func(data test.Data, helpers test.Helpers) {
128124
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -143,9 +139,8 @@ func TestRemove(t *testing.T) {
143139
{
144140
Description: "Remove image with created container - without -f",
145141
NoParallel: true,
146-
Require: test.Not(test.Windows),
147142
Setup: func(data test.Data, helpers test.Helpers) {
148-
helpers.Ensure("create", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
143+
helpers.Ensure("create", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
149144
},
150145
Cleanup: func(data test.Data, helpers test.Helpers) {
151146
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -164,10 +159,9 @@ func TestRemove(t *testing.T) {
164159
{
165160
Description: "Remove image with created container - with -f",
166161
NoParallel: true,
167-
Require: test.Not(test.Windows),
168162
Setup: func(data test.Data, helpers test.Helpers) {
169163
helpers.Ensure("pull", "--quiet", testutil.NginxAlpineImage)
170-
helpers.Ensure("create", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
164+
helpers.Ensure("create", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
171165
helpers.Ensure("rmi", testutil.NginxAlpineImage)
172166
},
173167
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -192,12 +186,11 @@ func TestRemove(t *testing.T) {
192186
Description: "Remove image with paused container - without -f",
193187
NoParallel: true,
194188
Require: test.Require(
195-
test.Not(test.Windows),
196189
test.Not(nerdtest.Docker),
197190
nerdtest.CGroup,
198191
),
199192
Setup: func(data test.Data, helpers test.Helpers) {
200-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
193+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
201194
helpers.Ensure("pause", data.Identifier())
202195
},
203196
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -220,7 +213,6 @@ func TestRemove(t *testing.T) {
220213
Description: "Remove image with paused container - with -f",
221214
NoParallel: true,
222215
Require: test.Require(
223-
test.Not(test.Windows),
224216
nerdtest.CGroup,
225217
// FIXME: nerdctl is broken
226218
// https://github.com/containerd/nerdctl/issues/3454
@@ -230,7 +222,7 @@ func TestRemove(t *testing.T) {
230222
test.Not(nerdtest.Docker),
231223
),
232224
Setup: func(data test.Data, helpers test.Helpers) {
233-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
225+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
234226
helpers.Ensure("pause", data.Identifier())
235227
},
236228
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -253,11 +245,10 @@ func TestRemove(t *testing.T) {
253245
Description: "Remove image with killed container - without -f",
254246
NoParallel: true,
255247
Require: test.Require(
256-
test.Not(test.Windows),
257248
test.Not(nerdtest.Docker),
258249
),
259250
Setup: func(data test.Data, helpers test.Helpers) {
260-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
251+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
261252
helpers.Ensure("kill", data.Identifier())
262253
},
263254
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -279,9 +270,8 @@ func TestRemove(t *testing.T) {
279270
{
280271
Description: "Remove image with killed container - with -f",
281272
NoParallel: true,
282-
Require: test.Not(test.Windows),
283273
Setup: func(data test.Data, helpers test.Helpers) {
284-
helpers.Ensure("run", "--pull", "always", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
274+
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
285275
helpers.Ensure("kill", data.Identifier())
286276
},
287277
Cleanup: func(data test.Data, helpers test.Helpers) {

‎cmd/nerdctl/issues/main_linux_test.go

Lines changed: 2 additions & 4 deletions
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

Lines changed: 25 additions & 7 deletions
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)