integration-cli: use remote daemon env var in TestCliProxyDisableProxyUnixSock #10796
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -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 | |||
There was a problem hiding this comment.
This should just be passing DOCKER_HOST along directly. See #10797 where I've fixed the other instance of this. 👍
|
LGTM! ❤️ (doh me: #10747 (comment)) |
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>
|
Made use of #10800 and updated PR with |
|
LGTM |
1 similar comment
|
LGTM |
jessfraz
pushed a commit
that referenced
this pull request
Feb 16, 2015
…ableProxyUnixSock-fix integration-cli: use remote daemon env var in TestCliProxyDisableProxyUnixSock
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TestCliProxyDisableProxyUnixSock execs
docker infobyclearing 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_HOSTand tries to connect unix sock.This fix injects
DOCKER_HOSTback to the test.Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
Label:
#windowscc: @cpuguy83 @unclejack @tianon @jfrazelle