diff --git a/drivers/docker/docklog/docker_logger_test.go b/drivers/docker/docklog/docker_logger_test.go index 16373c5f9..24e90cb69 100644 --- a/drivers/docker/docklog/docker_logger_test.go +++ b/drivers/docker/docklog/docker_logger_test.go @@ -3,6 +3,7 @@ package docklog import ( "bytes" "fmt" + "runtime" "testing" docker "github.com/fsouza/go-dockerclient" @@ -13,12 +14,24 @@ import ( "golang.org/x/net/context" ) +func testContainerDetails() (string, string, string) { + if runtime.GOOS == "windows" { + return "dantoml/busybox-windows:08012019", + "dantoml/busybox-windows", + "08012019" + } + + return "busybox:1", "busybox", "1" +} + func TestDockerLogger(t *testing.T) { ctu.DockerCompatible(t) t.Parallel() require := require.New(t) + containerImage, containerImageName, containerImageTag := testContainerDetails() + client, err := docker.NewClientFromEnv() if err != nil { t.Skip("docker unavailable:", err) diff --git a/drivers/docker/docklog/testing_unix.go b/drivers/docker/docklog/testing_unix.go deleted file mode 100644 index 42c319d83..000000000 --- a/drivers/docker/docklog/testing_unix.go +++ /dev/null @@ -1,9 +0,0 @@ -// +build darwin dragonfly freebsd linux netbsd openbsd solaris - -package docklog - -var ( - containerImage = "busybox:1" - containerImageName = "busybox" - containerImageTag = "1" -) diff --git a/drivers/docker/docklog/testing_windows.go b/drivers/docker/docklog/testing_windows.go deleted file mode 100644 index 4ec6b73c7..000000000 --- a/drivers/docker/docklog/testing_windows.go +++ /dev/null @@ -1,9 +0,0 @@ -// +build windows - -package docklog - -var ( - containerImage = "dantoml/busybox-windows:08012019" - containerImageName = "dantoml/busybox-windows" - containerImageTag = "08012019" -)