Merge pull request #52237 from azat/tests/fix-iptables

Fix network manager for integration tests
This commit is contained in:
Alexey Milovidov 2023-07-19 02:21:13 +03:00 committed by GitHub
commit 6c62c3b426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -219,10 +219,15 @@ class _NetworkManager:
def __init__(
self,
container_expire_timeout=120,
container_exit_timeout=120,
container_expire_timeout=600,
container_exit_timeout=660,
docker_api_version=os.environ.get("DOCKER_API_VERSION"),
):
# container should be alive for at least 15 seconds then the expiration
# timeout, this is the protection from the case when the container will
# be destroyed just when some test will try to use it.
assert container_exit_timeout >= container_expire_timeout + 15
self.container_expire_timeout = container_expire_timeout
self.container_exit_timeout = container_exit_timeout