Skip to content

Commit d43f1d5

Browse files
authored
Merge pull request #4360 from apostasie/2025-06-4322
[CI] Add delay for windows network test
2 parents 781f98b + 228be77 commit d43f1d5

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

cmd/nerdctl/network/network_inspect_test.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ import (
2020
"encoding/json"
2121
"errors"
2222
"os/exec"
23+
"runtime"
2324
"strings"
2425
"testing"
26+
"time"
2527

2628
"gotest.tools/v3/assert"
2729

@@ -290,6 +292,13 @@ func TestNetworkInspect(t *testing.T) {
290292
Setup: func(data test.Data, helpers test.Helpers) {
291293
helpers.Ensure("network", "create", data.Identifier("nginx-network-1"))
292294
helpers.Ensure("network", "create", data.Identifier("nginx-network-2"))
295+
296+
// See https://github.com/containerd/nerdctl/issues/4322
297+
// Maybe network create on windows is asynchronous?
298+
if runtime.GOOS == "windows" {
299+
time.Sleep(time.Second)
300+
}
301+
293302
helpers.Ensure("create", "--name", data.Identifier("nginx-container-1"), "--network", data.Identifier("nginx-network-1"), testutil.NginxAlpineImage)
294303
helpers.Ensure("create", "--name", data.Identifier("nginx-container-2"), "--network", data.Identifier("nginx-network-1"), testutil.NginxAlpineImage)
295304
helpers.Ensure("create", "--name", data.Identifier("nginx-container-on-diff-network"), "--network", data.Identifier("nginx-network-2"), testutil.NginxAlpineImage)
@@ -327,6 +336,12 @@ func TestNetworkInspect(t *testing.T) {
327336
helpers.Ensure("network", "create", data.Identifier("network-1"))
328337
helpers.Ensure("network", "create", data.Identifier("network-2"))
329338

339+
// See https://github.com/containerd/nerdctl/issues/4322
340+
// Maybe network create on windows is asynchronous?
341+
if runtime.GOOS == "windows" {
342+
time.Sleep(time.Second)
343+
}
344+
330345
containerID := helpers.Capture("run", "-d", "--name", data.Identifier(), "--network", data.Identifier("network-1"), "--network", data.Identifier("network-2"), testutil.CommonImage, "sleep", nerdtest.Infinity)
331346

332347
data.Labels().Set("containerID", strings.Trim(containerID, "\n"))
@@ -356,6 +371,12 @@ func TestNetworkInspect(t *testing.T) {
356371
helpers.Ensure("network", "create", data.Identifier("some-network"))
357372
helpers.Ensure("network", "create", data.Identifier("some-network-as-well"))
358373

374+
// See https://github.com/containerd/nerdctl/issues/4322
375+
// Maybe network create on windows is asynchronous?
376+
if runtime.GOOS == "windows" {
377+
time.Sleep(time.Second)
378+
}
379+
359380
helpers.Ensure("run", "-d", "--name", data.Identifier(), "--network", data.Identifier("some-network-as-well"), testutil.CommonImage, "sleep", nerdtest.Infinity)
360381
},
361382
Cleanup: func(data test.Data, helpers test.Helpers) {

0 commit comments

Comments
 (0)