dockerapi: Migrated ContainerRemove to Docker SDK #1481
Merged
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
haikuoliu
reviewed
Jul 27, 2018
| _, mockDockerSDK, client, _, _, _, done := dockerClientSetup(t) | ||
| defer done() | ||
|
|
||
| gomock.InOrder( |
There was a problem hiding this comment.
gomock.InOrder is unnecessary.
| defer cancel() | ||
|
|
||
| err := client.RemoveContainer(ctx, "id", xContainerShortTimeout) | ||
| assert.NotNil(t, err, "Expected error for pull timeout") |
There was a problem hiding this comment.
nit: assert.Error(t, err, "Expected error for remove timeout")
haikuoliu
approved these changes
Jul 27, 2018
sharanyad
approved these changes
Jul 27, 2018
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.
Summary
Migration for ContainerRemove to the Docker SDK
Implementation details
Changes were implemented by swapping API calls to new SDK Client. All changes could be done under the DockerClient interface making this migration fairly straightforward.
There were no previous tests for ContainerRemove so some were added to test normal function and timeouts.
Testing
make release)go build -out amazon-ecs-agent.exe ./agent)make test) passgo test -timeout=25s ./agent/...) passmake run-integ-tests) pass.\scripts\run-integ-tests.ps1) passmake run-functional-tests) pass.\scripts\run-functional-tests.ps1) passNew tests cover the changes: yes
Description for the changelog
Enhancement - ContainerRemove migrated to Docker SDK
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.