Merge pull request #39184 from feiskyer/dockertools

Automatic merge from submit-queue dockertools: don't test linux-specific cases on OSX There are a few test cases in dockertools are linux-specific. This PR moves them to docker_manager_linux_test.go Fixes #39183.

Merge pull request #39184 from feiskyer/dockertools
9a428cc5 · Kubernetes Submit Queue · GitHub · f1c8b758 · 16bcafb7 · 9a428cc5
Commit 9a428cc5 authored Dec 29, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 29, 2016
Showing with 1 addition and 0 deletions

BUILD pkg/kubelet/dockertools/BUILD +1 -0

docker_manager_linux_test.go pkg/kubelet/dockertools/docker_manager_linux_test.go +0 -0

docker_manager_test.go pkg/kubelet/dockertools/docker_manager_test.go +0 -0

No files found.
--- a/pkg/kubelet/dockertools/BUILD
+++ b/pkg/kubelet/dockertools/BUILD
@@ -84,6 +84,7 @@ go_test(
    srcs = [
        "container_gc_test.go",
        "convert_test.go",
+        "docker_manager_linux_test.go",
        "docker_manager_test.go",
        "docker_test.go",
        "images_test.go",

--- a/pkg/kubelet/dockertools/docker_manager_linux_test.go
+++ b/pkg/kubelet/dockertools/docker_manager_linux_test.go
--- a/pkg/kubelet/dockertools/docker_manager_test.go
+++ b/pkg/kubelet/dockertools/docker_manager_test.go