tests: DockerComposer contextmanager improvements #2591
Merged
Conversation
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
|
The tests run fine on Debian. |
buchdag
approved these changes
Mar 8, 2025
-Improve the DockerComposer contextmanager to make sure teardown happens by using try except block. -Move the self. declarations up so we are sure they are set even if an exception occurs. -set self._networks
Change pytest.fail to a logging error because pytest.fail makes DockerComposer ContextManager exit and no _down teardown is executed.
make sure we teardown on KeyboardInterrupt
If running from a container host-network-mode test fail because we cannot connect to host network. This prevents the cleanup. So make sure we always return network for later removal. Explicitly return None for readability
To make same as in test_wildcard-host.yml
…INER Connecting to host network not supported when pytest is running in container
d8a4c02 to
005b0bd
Compare
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.
Improvements to the DockerComposer contextmanager as mentioned in #2584 (review)
I run the test suite as container, and found that if errors occur or on keyboardinterrupt the containers and/or networks are not cleaned properly leaving ghost stuff around and preventing new test runs.
In Github CI not a problem because after tests the runner is terminated.
self._networksself._docker_compose_file = None>>self._docker_compose_files = None(files typo)pytest.failmakes DockerComposer ContextManager exit and no _down teardown is executed.PYTEST_RUNNING_IN_CONTAINERas this does not workA review from @pini-gh is highly appreciated to make sure Debian Stable is still OK.