fix elastic

Author: provinzkraut

src/pytest_databases/_service.py

@@ -135,6 +135,7 @@ def run(
         transient: bool = False,
         ulimits: list[Ulimit] | None = None,
         shm_size: int | None = None,
+        mem_limit: str | None = None,
     ) -> Generator[ServiceContainer, None, None]:
         if check is None and wait_for_log is None:
             msg = "Must set at least check or wait_for_log"
@@ -161,6 +162,7 @@ def run(
                     name=name,
                     environment=env,
                     ulimits=ulimits,
+                    mem_limit=mem_limit,
                 )
                 container.reload()
 

src/pytest_databases/docker/elastic_search.py

@@ -44,12 +44,18 @@ def elasticsearch8_responsive(scheme: str, host: str, port: int, user: str, pass
         return False
 
 
+@pytest.fixture(scope="session")
+def elasticsearch_service_memory_limit() -> str:
+    return "1g"
+
+
 @contextlib.contextmanager
 def _provide_elasticsearch_service(
     docker_service: DockerService,
     image: str,
     name: str,
     client_cls: type[Elasticsearch7 | Elasticsearch8],
+    memory_limit: str,
 ) -> Generator[ElasticsearchService, None, None]:
     user = "elastic"
     password = "changeme"
@@ -79,6 +85,7 @@ def check(_service: ServiceContainer) -> bool:
         timeout=120,
         pause=1,
         transient=True,
+        mem_limit="1g",
     ) as service:
         yield ElasticsearchService(
             host=service.host,
@@ -91,23 +98,31 @@ def check(_service: ServiceContainer) -> bool:
 
 
 @pytest.fixture(autouse=False, scope="session")
-def elasticsearch_7_service(docker_service: DockerService) -> Generator[ElasticsearchService, None, None]:
+def elasticsearch_7_service(
+    docker_service: DockerService,
+    elasticsearch_service_memory_limit: str,
+) -> Generator[ElasticsearchService, None, None]:
     with _provide_elasticsearch_service(
         docker_service=docker_service,
         image="elasticsearch:7.17.19",
         name="elasticsearch-7",
         client_cls=Elasticsearch7,
+        memory_limit=elasticsearch_service_memory_limit,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
-def elasticsearch_8_service(docker_service: DockerService) -> Generator[ElasticsearchService, None, None]:
+def elasticsearch_8_service(
+    docker_service: DockerService,
+    elasticsearch_service_memory_limit: str,
+) -> Generator[ElasticsearchService, None, None]:
     with _provide_elasticsearch_service(
         docker_service=docker_service,
         image="elasticsearch:8.13.0",
         name="elasticsearch-8",
         client_cls=Elasticsearch8,
+        memory_limit=elasticsearch_service_memory_limit,
     ) as service:
         yield service
 

tests/test_elasticsearch.py

@@ -8,10 +8,12 @@
 
 def test_elasticsearch_7(pytester: pytest.Pytester) -> None:
     pytester.makepyfile("""
+    from elasticsearch7 import Elasticsearch
+
     pytest_plugins = ["pytest_databases.docker.elastic_search"]
 
     def test(elasticsearch_7_service) -> None:
-        with Elasticsearch7(
+        with Elasticsearch(
             hosts=[
                 {
                     "host": elasticsearch_7_service.host,
@@ -33,10 +35,12 @@ def test(elasticsearch_7_service) -> None:
 
 def test_elasticsearch_8(pytester: pytest.Pytester) -> None:
     pytester.makepyfile("""
+    from elasticsearch7 import Elasticsearch
+
     pytest_plugins = ["pytest_databases.docker.elastic_search"]
 
     def test(elasticsearch_8_service) -> None:
-        with Elasticsearch8(
+        with Elasticsearch(
             hosts=[
                 {
                     "host": elasticsearch_8_service.host,