New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

integration-cli: use remote daemon env var in TestCliProxyDisableProxyUnixSock #10796

Merged
merged 1 commit into from Feb 16, 2015

Conversation

Projects
None yet
5 participants
@ahmetb
Contributor

ahmetb commented Feb 14, 2015

TestCliProxyDisableProxyUnixSock execs 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 ahmetalpbalkan@gmail.com
Label: #windows
cc: @cpuguy83 @unclejack @tianon @jfrazelle

@@ -10,6 +10,9 @@ import (
func TestCliProxyDisableProxyUnixSock(t *testing.T) {
cmd := exec.Command(dockerBinary, "info")
cmd.Env = []string{"HTTP_PROXY=http://127.0.0.1:9999"}
if testHost := os.Getenv("DOCKER_TEST_HOST"); testHost != "" { // preserve remote test daemon addr

This comment has been minimized.

@tianon

tianon Feb 14, 2015

Member

This should just be passing DOCKER_HOST along directly. See #10797 where I've fixed the other instance of this. 👍

@tianon

This comment has been minimized.

Member

tianon commented Feb 14, 2015

LGTM! ❤️

(doh me: #10747 (comment))

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 <ahmetalpbalkan@gmail.com>
@ahmetb

This comment has been minimized.

Contributor

ahmetb commented Feb 16, 2015

Made use of #10800 and updated PR with appendDockerHostEnv

@crosbymichael

This comment has been minimized.

Member

crosbymichael commented Feb 16, 2015

LGTM

1 similar comment
@jessfraz

This comment has been minimized.

Contributor

jessfraz commented Feb 16, 2015

LGTM

jessfraz pushed a commit that referenced this pull request Feb 16, 2015

Jessie Frazelle
Merge pull request #10796 from ahmetalpbalkan/win-cli/TestCliProxyDis…
…ableProxyUnixSock-fix

integration-cli: use remote daemon env var in TestCliProxyDisableProxyUnixSock

@jessfraz jessfraz merged commit 39df847 into moby:master Feb 16, 2015

1 check passed

janky Jenkins build Docker-PRs 1157 has succeeded
Details

@ahmetb ahmetb deleted the ahmetb:win-cli/TestCliProxyDisableProxyUnixSock-fix branch Feb 16, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment