Merge branch 'main' into docs/use-supported-gfm-marker

Author: leonkozlowski

src/testcontainers/community/trino/__init__.py

@@ -38,7 +38,7 @@ def __init__(
         )
 
     def get_connection_url(self):
-        return f"trino://{self.user}@{self.get_container_host_ip()}:{self.port}"
+        return f"trino://{self.user}@{self.get_container_host_ip()}:{self.get_exposed_port(self.port)}"
 
     def _configure(self):
         pass

src/testcontainers/core/wait_strategies.py

@@ -418,7 +418,12 @@ def _try_http_request(self, url: str, headers: dict[str, str], ssl_context: Any)
             with urlopen(request, timeout=1, context=ssl_context) as response:
                 return self._check_response(response, url)
 
-        except (URLError, HTTPError) as e:
+        except HTTPError as e:
+            # HTTPError wraps the response file object, so it doubles as a
+            # context manager to avoid leaking the file descriptor.
+            with e:
+                return self._handle_http_error(e)
+        except URLError as e:
             return self._handle_http_error(e)
         except (ConnectionResetError, ConnectionRefusedError, BrokenPipeError, OSError) as e:
             # Handle connection-level errors that can occur during HTTP requests

tests/community/trino/test_trino.py

@@ -1,3 +1,4 @@
+import sqlalchemy
 from trino.dbapi import connect
 
 from testcontainers.community.trino import TrinoContainer
@@ -16,3 +17,12 @@ def test_docker_run_trino():
         rows = cur.fetchall()
         assert rows[0][0] == "451"
         conn.close()
+
+
+def test_get_connection_url():
+    container = TrinoContainer("trinodb/trino:451")
+    with container as trino:
+        engine = sqlalchemy.create_engine(trino.get_connection_url())
+        with engine.connect() as connection:
+            result = connection.execute(sqlalchemy.text("SELECT version()"))
+            assert result.fetchone()[0] == "451"

tests/core/test_wait_strategies.py

@@ -1,9 +1,12 @@
+import io
 import itertools
 import logging
 import re
 import time
 from datetime import timedelta
+from email.message import Message
 from unittest.mock import Mock, patch
+from urllib.error import HTTPError
 
 import pytest
 
@@ -361,6 +364,31 @@ def test_from_url(self, url, expected_port, expected_path, expected_tls):
         assert strategy._path == expected_path
         assert strategy._tls is expected_tls
 
+    @pytest.mark.parametrize(
+        "status_codes,expected_result",
+        [
+            ({503}, True),
+            (set(), False),
+        ],
+        ids=[
+            "accepted_error_status_code",
+            "unaccepted_error_status_code",
+        ],
+    )
+    @patch("testcontainers.core.wait_strategies.urlopen")
+    def test_try_http_request_closes_http_error(self, mock_urlopen, status_codes, expected_result):
+        """HTTPError holds the response's file object and must be closed (issue #1115)."""
+        fp = io.BytesIO(b"error body")
+        mock_urlopen.side_effect = HTTPError("http://localhost:8080/", 503, "Service Unavailable", Message(), fp)
+        strategy = HttpWaitStrategy(8080)
+        for code in status_codes:
+            strategy.for_status_code(code)
+
+        result = strategy._try_http_request("http://localhost:8080/", {}, None)
+
+        assert result is expected_result
+        assert fp.closed
+
 
 class TestHealthcheckWaitStrategy:
     """Test the HealthcheckWaitStrategy class."""