From f6f2bad7ea5ca642a261df4d8a0ddb43d09bda62 Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Fri, 6 Mar 2015 14:45:26 -0800 Subject: [PATCH] integ-cli: skip test assuming -H is unix://... `TestCliProxyDisableProxyUnixSock` verifies that HTTP_PROXY env var is used when DOCKER_HOST is not set and cli connects to `unix://...` by default. In the windows/darwin CLI CIs, daemon is on remote host and we always connect via `tcp://`, therefore this test fails very straight. Skipping this test to run only on "same host daemon" assumption. Signed-off-by: Ahmet Alp Balkan --- integration-cli/docker_cli_proxy_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-cli/docker_cli_proxy_test.go b/integration-cli/docker_cli_proxy_test.go index 98129bdae8..7d442c590a 100644 --- a/integration-cli/docker_cli_proxy_test.go +++ b/integration-cli/docker_cli_proxy_test.go @@ -8,6 +8,8 @@ import ( ) func TestCliProxyDisableProxyUnixSock(t *testing.T) { + testRequires(t, SameHostDaemon) // test is valid when DOCKER_HOST=unix://.. + cmd := exec.Command(dockerBinary, "info") cmd.Env = appendDockerHostEnv([]string{"HTTP_PROXY=http://127.0.0.1:9999"})