combine tc with tc-core and pass tests

core/tests/test_core.py

@@ -5,6 +5,8 @@
 
 
 def test_raise_timeout():
+    import pathlib
+    pathlib.Path('/tmp/YESS').write_text('abc')
     with pytest.raises(TimeoutError):
         with DockerContainer("alpine").with_command("sleep 2") as container:
             wait_for_logs(container, "Hello from Docker!", timeout=1e-3)

modules/elasticsearch/tests/test_elasticsearch.py

@@ -1,5 +1,5 @@
 import json
-import urllib
+import urllib.request
 import pytest
 
 from testcontainers.elasticsearch import ElasticSearchContainer
@@ -8,6 +8,6 @@
 # The versions below were the current supported versions at time of writing (2022-08-11)
 @pytest.mark.parametrize('version', ['6.8.23', '7.17.5', '8.3.3'])
 def test_docker_run_elasticsearch(version):
-    with ElasticSearchContainer(f'elasticsearch:{version}') as es:
+    with ElasticSearchContainer(f'elasticsearch:{version}', mem_limit='3G') as es:
         resp = urllib.request.urlopen(es.get_url())
         assert json.loads(resp.read().decode())['version']['number'] == version

modules/opensearch/testcontainers/opensearch/__init__.py

@@ -1,5 +1,6 @@
 from opensearchpy import OpenSearch
 from opensearchpy.exceptions import ConnectionError, TransportError
+from urllib3.exceptions import ProtocolError
 
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.utils import raise_for_deprecated_parameter
@@ -84,7 +85,12 @@ def get_client(self, verify_certs: bool = False, **kwargs) -> OpenSearch:
             **kwargs,
         )
 
-    @wait_container_is_ready(ConnectionError, TransportError)
+    @wait_container_is_ready(
+        ConnectionError,
+        TransportError,
+        ProtocolError,
+        ConnectionResetError
+    )
     def _healthcheck(self) -> None:
         """This is an internal method used to check if the OpenSearch container
         is healthy and ready to receive requests."""

pyproject.toml

@@ -27,6 +27,7 @@ classifiers = [
 ]
 # testcontainers-core is a proper package dependency - only modules needed here
 packages = [
+    { include = "testcontainers", from = "core" },
     { include = "testcontainers", from = "modules/arangodb" },
     { include = "testcontainers", from = "modules/azurite" },
     { include = "testcontainers", from = "modules/clickhouse" },
@@ -56,7 +57,9 @@ packages = [
 
 [tool.poetry.dependencies]
 python = ">=3.9,<3.12"
-testcontainers-core = "4.0.0" # x-release-please-version
+docker = "*" # ">=4.0"
+urllib3 = "*" # "<2.0"
+wrapt = "*" # "^1.16.0"
 
 # community modules
 python-arango = { version = "^7.8", optional = true }
@@ -103,11 +106,11 @@ redis = ["redis"]
 selenium = ["selenium"]
 
 [tool.poetry.group.dev.dependencies]
-testcontainers-core = { path = "core", develop = true }
 pytest = "7.4.3"
 pytest-cov = "4.1.0"
 sphinx = "^7.2.6"
 flake8 = "^6.1.0"
+pg8000 = "*"
 
 [[tool.poetry.source]]
 name = "PyPI"