Modifying integration test due to new ipam options in swarmkit#35103
Merged
yongtang merged 2 commits intoOct 10, 2017
Merged
Conversation
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Closed
Member
|
@abhi @fcrisciani looks like this bump does not have the latest commits that #35143 had (moby/libnetwork@0f08d31...930c292) |
thaJeztah
requested changes
Oct 9, 2017
thaJeztah
left a comment
Member
There was a problem hiding this comment.
two small nits, but otherwise look local changes look good
| c.Assert(err, checker.IsNil, check.Commentf(out)) | ||
| c.Assert(strings.TrimSpace(out), checker.Equals, "map[foo:bar]") | ||
| c.Assert(strings.TrimSpace(out), checker.Contains, "foo:bar") | ||
| c.Assert(strings.TrimSpace(out), checker.Contains, "com.docker.network.ipam.serial:true") |
Member
There was a problem hiding this comment.
Looks like this line uses spaces instead of tabs for indentation
| c.Assert(err, checker.IsNil, check.Commentf(out)) | ||
| c.Assert(strings.TrimSpace(out), checker.Equals, "map[foo:bar]") | ||
| c.Assert(strings.TrimSpace(out), checker.Contains, "foo:bar") | ||
| c.Assert(strings.TrimSpace(out), checker.Contains, "com.docker.network.ipam.serial:true") |
Member
There was a problem hiding this comment.
Same here (spaces instead of tabs)
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
Contributor
Author
|
@thaJeztah updated :) |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
- What I did
Modified integration test to support checking for newly added ipam options. Vendored libnetwork and swarmkit.
- How I did it
Added check in integration-cli/docker_cli_swarm_test.go
- How to verify it
Run integration test