Accounting for asynchronous service removals #2228
Open
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
Swarmkit services' removal will soon become asynchronous (see moby/moby#38525); that is, a service will only actually get deleted once all of its containers are shut down. This patch changes service tests' `tearDown` to wait for services to be actually removed, so that there's no name collision with subsequent tests. This change is fully backward compatible with the engine's current behaviour. Couple of other misc changes: consolidated polling in a single `wait_until_truthy` function, and allowed passing more flags to `py.test` in the makefile test-integration targets through a new optional `pytest_options` env variable. Signed-off-by: Jean Rouge <[email protected]>
wk8
commented
Jan 12, 2019
| @@ -35,11 +35,11 @@ unit-test-py3: build-py3 | |||
|
|
|||
| .PHONY: integration-test | |||
| integration-test: build | |||
| docker run -t --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python py.test -v tests/integration/${file} | |||
| docker run -t --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python py.test -v tests/integration/${file} ${pytest_options} | |||
There was a problem hiding this comment.
Comes in handy to just run a test or two using -k (https://docs.pytest.org/en/latest/example/markers.html#using-k-expr-to-select-tests-based-on-their-name)
|
Just to copy over what I said in moby/moby, there should be nothing to change in docker-py (or any API client). If docker-py is broken because of a proposed change in moby, then the proposed change is incorrect. |
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.
Swarmkit services' removal will soon become asynchronous (see
moby/moby#38525); that is, a service will only actually
get deleted once all of its containers are shut down.
This patch changes service tests'
tearDownto wait for services to beactually removed, so that there's no name collision with subsequent tests.
This change is fully backward compatible with the engine's current behaviour.
Couple of other misc changes: consolidated polling in a single
wait_until_truthyfunction, and allowed passing more flags topy.testinthe makefile test-integration targets through a new optional
pytest_optionsenv variable.
Signed-off-by: Jean Rouge [email protected]