summaryrefslogtreecommitdiff
path: root/integration/internal
diff options
context:
space:
mode:
authorOlli Janatuinen <olli.janatuinen@gmail.com>2019-05-14 23:01:12 +0300
committerOlli Janatuinen <olli.janatuinen@gmail.com>2019-06-10 21:32:36 +0300
commit2f22247cad9237d255a4b541a974705802abdad8 (patch)
tree111babcc4edd90b17b36324fcfd7a8b1dcdb09ea /integration/internal
parentcf406eb35944bec9765ab19e5895972b03467417 (diff)
downloaddocker-2f22247cad9237d255a4b541a974705802abdad8.tar.gz
Enable integrations API tests for Windows CI
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
Diffstat (limited to 'integration/internal')
-rw-r--r--integration/internal/container/container.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/integration/internal/container/container.go b/integration/internal/container/container.go
index 280f64897d..b578a368d8 100644
--- a/integration/internal/container/container.go
+++ b/integration/internal/container/container.go
@@ -2,6 +2,7 @@ package container
import (
"context"
+ "runtime"
"testing"
"github.com/docker/docker/api/types"
@@ -24,10 +25,14 @@ type TestContainerConfig struct {
// nolint: golint
func create(t *testing.T, ctx context.Context, client client.APIClient, ops ...func(*TestContainerConfig)) (container.ContainerCreateCreatedBody, error) { // nolint: golint
t.Helper()
+ cmd := []string{"top"}
+ if runtime.GOOS == "windows" {
+ cmd = []string{"sleep", "240"}
+ }
config := &TestContainerConfig{
Config: &container.Config{
Image: "busybox",
- Cmd: []string{"top"},
+ Cmd: cmd,
},
HostConfig: &container.HostConfig{},
NetworkingConfig: &network.NetworkingConfig{},