From 029ca9829df1d42a67289e0318db416cdbcfaf35 Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Sat, 14 Feb 2015 00:01:33 -0800 Subject: [PATCH] integration-cli: use remote daemon in proxy test TestCliProxyDisableProxyUnixSock runs `docker info` by clearing env however if the daemon is set up to run in a different machine (e.g. Windows CI case) it does not make use of DOCKER_TEST_HOST and tries to connect unix sock. This fix injects DOCKER_HOST back to the test. Signed-off-by: Ahmet Alp Balkan --- integration-cli/docker_cli_proxy_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_proxy_test.go b/integration-cli/docker_cli_proxy_test.go index 7a08aef9aa..43c46d4acc 100644 --- a/integration-cli/docker_cli_proxy_test.go +++ b/integration-cli/docker_cli_proxy_test.go @@ -9,7 +9,7 @@ import ( func TestCliProxyDisableProxyUnixSock(t *testing.T) { cmd := exec.Command(dockerBinary, "info") - cmd.Env = []string{"HTTP_PROXY=http://127.0.0.1:9999"} + cmd.Env = appendDockerHostEnv([]string{"HTTP_PROXY=http://127.0.0.1:9999"}) if out, _, err := runCommandWithOutput(cmd); err != nil { t.Fatal(err, out)