Skip to content

Vendoring libnetwork @9ab6e13#28019

Merged
mavenugo merged 2 commits intomoby:masterfrom
sanimej:vendor
Nov 3, 2016
Merged

Vendoring libnetwork @9ab6e13#28019
mavenugo merged 2 commits intomoby:masterfrom
sanimej:vendor

Conversation

@sanimej
Copy link
Copy Markdown

@sanimej sanimej commented Nov 3, 2016

Fixes #25497
Fixes #26724
also fixes #27449
Related to #26880

Signed-off-by: Santhosh Manohar santhosh@docker.com

@sanimej sanimej changed the title Vendoring libnetwork @9ab6e136fa628b5bb4af4a75f76609ef2c21c024 Vendoring libnetwork @9ab6e13 Nov 3, 2016
@allencloud
Copy link
Copy Markdown
Contributor

also fixes #27449

@thaJeztah
Copy link
Copy Markdown
Member

@sanimej first issue #25794 looks to be the wrong one, can you check?

@AkihiroSuda AkihiroSuda added the status/failing-ci Indicates that the PR in its current state fails the test suite label Nov 3, 2016
@AkihiroSuda
Copy link
Copy Markdown
Member

CI failing

07:44:10 FAIL: docker_cli_network_unix_test.go:1659: DockerNetworkSuite.TestDockerNetworkCreateDeleteSpecialCharacters
07:44:10 
07:44:10 docker_cli_network_unix_test.go:1660:
07:44:10     dockerCmd(c, "network", "create", "test@#$")
07:44:10 docker_utils.go:505:
07:44:10     c.Assert(result, icmd.Matches, icmd.Success)
07:44:10 ... result *cmd.Result = &cmd.Result{Cmd:(*exec.Cmd)(0xc421103a20), ExitCode:1, Error:(*exec.ExitError)(0xc4234c0780), Timeout:false, outBuffer:(*cmd.lockedBuffer)(0xc4208207e0), errBuffer:(*cmd.lockedBuffer)(0xc420820870)} ("\nCommand: /go/src/github.com/docker/docker/bundles/1.13.0-dev/binary-client/docker network create test@#$\nExitCode: 1, Error: exit status 1\nStdout: \nStderr: Error response from daemon: invalid name: test@#$ includes invalid characters, only \"[a-zA-Z0-9][a-zA-Z0-9_.-]\" are allowed\n\n")
07:44:10 ... expected cmd.Expected = cmd.Expected{ExitCode:0, Timeout:false, Error:"", Out:"", Err:""}
07:44:10 ... 
07:44:10 Command: /go/src/github.com/docker/docker/bundles/1.13.0-dev/binary-client/docker network create test@#$
07:44:10 ExitCode: 1, Error: exit status 1
07:44:10 Stdout: 
07:44:10 Stderr: Error response from daemon: invalid name: test@#$ includes invalid characters, only "[a-zA-Z0-9][a-zA-Z0-9_.-]" are allowed
07:44:10 
07:44:10 
07:44:10 Failures:
07:44:10 ExitCode was 1 expected 0
07:44:10 Expected no error

@allencloud
Copy link
Copy Markdown
Contributor

yes @AkihiroSuda
newly vendored libnetwork validates the network name more strictly. So maybe we need to update the test case as well. @sanimej

@sanimej
Copy link
Copy Markdown
Author

sanimej commented Nov 3, 2016

@thaJeztah Corrected the issue number. Its #25497

@sanimej
Copy link
Copy Markdown
Author

sanimej commented Nov 3, 2016

@allencloud Yes, I will update the test to avoid the invalid characters in the name.

Santhosh Manohar added 2 commits November 3, 2016 10:58
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
@thaJeztah thaJeztah removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Nov 3, 2016
@thaJeztah
Copy link
Copy Markdown
Member

ping @mrjana @mavenugo PTAL

@mrjana
Copy link
Copy Markdown
Contributor

mrjana commented Nov 3, 2016

LGTM

1 similar comment
@mavenugo
Copy link
Copy Markdown
Contributor

mavenugo commented Nov 3, 2016

LGTM

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

Projects

None yet

8 participants