FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(elasticsearch): Use wait strategy instead of deprecated decorator by artem-ilin · Pull Request #915 · testcontainers/testcontainers-python · GitHub

/ testcontainers-python Public

fix(elasticsearch): Use wait strategy instead of deprecated decorator #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexanderankin merged 2 commits into from
Dec 5, 2025
Conversation 10 Commits 2 Checks 13 Files changed
Merged

fix(elasticsearch): Use wait strategy instead of deprecated decorator #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d39872
fix(elasticsearch): Use wait strategy instead of deprecated decorator
artem-ilin Nov 4, 2025
3c08dbb
Merge branch 'main' into elasticsearch-wait-strategy
artem-ilin Dec 5, 2025
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
24 changes: 3 additions & 21 deletions modules/elasticsearch/testcontainers/elasticsearch/__init__.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
# under the License.
import logging
import re
import urllib
from urllib.error import URLError

from testcontainers.core.container import DockerContainer
from testcontainers.core.utils import raise_for_deprecated_parameter
from testcontainers.core.waiting_utils import wait_container_is_ready
from testcontainers.core.wait_strategies import HttpWaitStrategy

_FALLBACK_VERSION = 8
"""This version is used when no version could be detected from the image name."""
Expand Down Expand Up @@ -69,14 +67,14 @@ class ElasticSearchContainer(DockerContainer):
>>> from testcontainers.elasticsearch import ElasticSearchContainer

>>> with ElasticSearchContainer(f'elasticsearch:8.3.3', mem_limit='3G') as es:
... resp = urllib.request.urlopen(es.get_url())
... resp = urllib.request.urlopen(f'http://{es.get_container_host_ip()}:{es.get_exposed_port(es.port)}')
... json.loads(resp.read().decode())['version']['number']
'8.3.3'
"""

def __init__(self, image: str = "elasticsearch", port: int = 9200, **kwargs) -> None:
raise_for_deprecated_parameter(kwargs, "port_to_expose", "port")
super().__init__(image, **kwargs)
super().__init__(image, _wait_strategy=HttpWaitStrategy(port), **kwargs)
self.port = port
self.with_exposed_ports(self.port)
self.with_env("transport.host", "127.0.0.1")
Expand All @@ -85,19 +83,3 @@ def __init__(self, image: str = "elasticsearch", port: int = 9200, **kwargs) ->
major_version = _major_version_from_image_name(image)
for key, value in _environment_by_version(major_version).items():
self.with_env(key, value)

@wait_container_is_ready(URLError)
def _connect(self) -> None:
res = urllib.request.urlopen(self.get_url())
if res.status != 200:
raise Exception()

def get_url(self) -> str:
host = self.get_container_host_ip()
port = self.get_exposed_port(self.port)
return f"http://{host}:{port}"

def start(self) -> "ElasticSearchContainer":
super().start()
self._connect()
return self
2 changes: 1 addition & 1 deletion modules/elasticsearch/tests/test_elasticsearch.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
@pytest.mark.parametrize("version", ["7.17.18", "8.12.2"])
def test_docker_run_elasticsearch(version):
with ElasticSearchContainer(f"elasticsearch:{version}", mem_limit="3G") as es:
resp = urllib.request.urlopen(es.get_url())
resp = urllib.request.urlopen(f"http://{es.get_container_host_ip()}:{es.get_exposed_port(es.port)}")
assert json.loads(resp.read().decode())["version"]["number"] == version
Loading
Back | FazBrowse Home | New Git URL