testcontainers-mockserver 7.2.0__tar.gz → 7.4.0__tar.gz

{testcontainers_mockserver-7.2.0 → testcontainers_mockserver-7.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testcontainers-mockserver
-Version: 7.2.0
+Version: 7.4.0
 Summary: Testcontainers module for MockServer
 Author-email: James D Bloom <jamesdbloom@gmail.com>
 License-Expression: Apache-2.0
@@ -21,6 +21,7 @@ Classifier: Topic :: Software Development :: Testing
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: testcontainers>=4.0.0
+Requires-Dist: mockserver-client>=5.15
 Provides-Extra: test
 Requires-Dist: pytest>=7.0; extra == "test"
 Requires-Dist: requests>=2.20; extra == "test"
@@ -62,13 +63,14 @@ with MockServerContainer() as mockserver:
 
 ### `MockServerContainer(image=..., port=1080)`
 
-- `image` — Docker image to use. Defaults to `mockserver/mockserver:mockserver-7.1.0`.
+- `image` — Docker image to use. Defaults to `mockserver/mockserver:mockserver-7.3.0`.
 - `port` — Container port MockServer listens on. Defaults to `1080`.
 
 ### Methods
 
 | Method | Returns | Description |
 |--------|---------|-------------|
+| `get_client()` | `MockServerClient` | A cached, ready-wired `mockserver` client pointed at the mapped host/port |
 | `get_url()` | `str` | HTTP base URL (e.g. `http://localhost:49152`) |
 | `get_secure_url()` | `str` | HTTPS base URL (same port, `https://` scheme) |
 | `get_host()` | `str` | Mapped host IP |

{testcontainers_mockserver-7.2.0 → testcontainers_mockserver-7.4.0}/README.md

@@ -35,13 +35,14 @@ with MockServerContainer() as mockserver:
 
 ### `MockServerContainer(image=..., port=1080)`
 
-- `image` — Docker image to use. Defaults to `mockserver/mockserver:mockserver-7.1.0`.
+- `image` — Docker image to use. Defaults to `mockserver/mockserver:mockserver-7.3.0`.
 - `port` — Container port MockServer listens on. Defaults to `1080`.
 
 ### Methods
 
 | Method | Returns | Description |
 |--------|---------|-------------|
+| `get_client()` | `MockServerClient` | A cached, ready-wired `mockserver` client pointed at the mapped host/port |
 | `get_url()` | `str` | HTTP base URL (e.g. `http://localhost:49152`) |
 | `get_secure_url()` | `str` | HTTPS base URL (same port, `https://` scheme) |
 | `get_host()` | `str` | Mapped host IP |

{testcontainers_mockserver-7.2.0 → testcontainers_mockserver-7.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "testcontainers-mockserver"
-version = "7.2.0"
+version = "7.4.0"
 description = "Testcontainers module for MockServer"
 readme = "README.md"
 license = "Apache-2.0"
@@ -27,6 +27,7 @@ classifiers = [
 ]
 dependencies = [
     "testcontainers>=4.0.0",
+    "mockserver-client>=5.15",
 ]
 
 [project.optional-dependencies]

{testcontainers_mockserver-7.2.0 → testcontainers_mockserver-7.4.0}/src/testcontainers_mockserver/__init__.py

@@ -14,7 +14,13 @@ Example::
         # Use requests or any HTTP client to interact with MockServer at this URL.
 """
 
+from importlib import metadata
+
 from testcontainers_mockserver.container import MockServerContainer
 
 __all__ = ["MockServerContainer"]
-__version__ = "7.0.0"
+
+try:
+    __version__ = metadata.version("testcontainers-mockserver")
+except metadata.PackageNotFoundError:  # pragma: no cover - source tree without install
+    __version__ = "0.0.0"

{testcontainers_mockserver-7.2.0 → testcontainers_mockserver-7.4.0}/src/testcontainers_mockserver/container.py

@@ -8,7 +8,7 @@ methods for the mapped host, port, and URL.
 
 from __future__ import annotations
 
-from typing import Optional
+from importlib import metadata
 
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.wait_strategies import HttpWaitStrategy
@@ -20,8 +20,23 @@ MOCKSERVER_PORT = 1080
 #: Default Docker image name for MockServer.
 _IMAGE_NAME = "mockserver/mockserver"
 
-#: Default image tag, pinned to the current MockServer release version.
-_DEFAULT_TAG = "mockserver-7.0.0"
+
+def _default_tag() -> str:
+    """Derive the default image tag from the installed MockServer client version.
+
+    Mirrors the Java module: the tag is ``mockserver-<client-version>`` so the
+    container image stays in lockstep with the ``mockserver-client`` package.
+    Falls back to ``latest`` when the client version cannot be resolved (e.g. the
+    client is not installed), matching the Java ``:latest`` fallback.
+    """
+    try:
+        return "mockserver-" + metadata.version("mockserver-client")
+    except metadata.PackageNotFoundError:
+        return "latest"
+
+
+#: Default image tag, derived from the installed MockServer client version.
+_DEFAULT_TAG = _default_tag()
 
 
 class MockServerContainer(DockerContainer):
@@ -58,6 +73,7 @@ class MockServerContainer(DockerContainer):
     ) -> None:
         super().__init__(image=image, **kwargs)
         self._port = port
+        self._client = None
         self.with_exposed_ports(self._port)
         self.with_env("SERVER_PORT", str(self._port))
 
@@ -100,6 +116,21 @@ class MockServerContainer(DockerContainer):
         """Return the HTTPS base URL for MockServer (same port, different scheme)."""
         return f"https://{self.get_host()}:{self.get_port()}"
 
+    def get_client(self):
+        """Return a ``MockServerClient`` connected to this container.
+
+        The client is created lazily on first call and cached. Mirrors the Java
+        module's ``getClient()``. Requires the ``mockserver-client`` package,
+        which is declared as a dependency of this module.
+
+        :returns: a ``mockserver.MockServerClient`` pointed at the mapped host/port
+        """
+        if self._client is None:
+            from mockserver import MockServerClient
+
+            self._client = MockServerClient(self.get_host(), self.get_port())
+        return self._client
+
     # ------------------------------------------------------------------
     # Configuration helpers (fluent)
     # ------------------------------------------------------------------

{testcontainers_mockserver-7.2.0 → testcontainers_mockserver-7.4.0}/src/testcontainers_mockserver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testcontainers-mockserver
-Version: 7.2.0
+Version: 7.4.0
 Summary: Testcontainers module for MockServer
 Author-email: James D Bloom <jamesdbloom@gmail.com>
 License-Expression: Apache-2.0
@@ -21,6 +21,7 @@ Classifier: Topic :: Software Development :: Testing
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: testcontainers>=4.0.0
+Requires-Dist: mockserver-client>=5.15
 Provides-Extra: test
 Requires-Dist: pytest>=7.0; extra == "test"
 Requires-Dist: requests>=2.20; extra == "test"
@@ -62,13 +63,14 @@ with MockServerContainer() as mockserver:
 
 ### `MockServerContainer(image=..., port=1080)`
 
-- `image` — Docker image to use. Defaults to `mockserver/mockserver:mockserver-7.1.0`.
+- `image` — Docker image to use. Defaults to `mockserver/mockserver:mockserver-7.3.0`.
 - `port` — Container port MockServer listens on. Defaults to `1080`.
 
 ### Methods
 
 | Method | Returns | Description |
 |--------|---------|-------------|
+| `get_client()` | `MockServerClient` | A cached, ready-wired `mockserver` client pointed at the mapped host/port |
 | `get_url()` | `str` | HTTP base URL (e.g. `http://localhost:49152`) |
 | `get_secure_url()` | `str` | HTTPS base URL (same port, `https://` scheme) |
 | `get_host()` | `str` | Mapped host IP |

{testcontainers_mockserver-7.2.0 → testcontainers_mockserver-7.4.0}/src/testcontainers_mockserver.egg-info/requires.txt

@@ -1,4 +1,5 @@
 testcontainers>=4.0.0
+mockserver-client>=5.15
 
 [test]
 pytest>=7.0

{testcontainers_mockserver-7.2.0 → testcontainers_mockserver-7.4.0}/tests/test_container_config.py

@@ -175,14 +175,45 @@ class TestUrlShaping:
         assert called_with == [9090]
 
 
-class TestVersionPinning:
-    """Tests that verify the version is correctly pinned."""
+class TestVersionDerivation:
+    """Tests that verify the default image tag is derived, not hard-pinned."""
 
-    def test_default_tag_matches_release_version(self):
-        """The default tag must match the current MockServer release."""
-        assert _DEFAULT_TAG == "mockserver-7.0.0"
+    def test_default_tag_derives_from_client_or_latest(self):
+        """The default tag derives from the client version, or falls back to latest."""
+        # Either 'mockserver-<version>' (client installed) or 'latest' (fallback).
+        assert _DEFAULT_TAG == "latest" or _DEFAULT_TAG.startswith("mockserver-")
 
-    def test_module_version(self):
-        """The package version must match the MockServer release."""
-        import testcontainers_mockserver
-        assert testcontainers_mockserver.__version__ == "7.0.0"
+    def test_default_tag_helper_falls_back_to_latest(self, monkeypatch):
+        """When the client package is absent, the tag falls back to 'latest'."""
+        from importlib import metadata
+
+        from testcontainers_mockserver import container as container_module
+
+        def _raise(_name):
+            raise metadata.PackageNotFoundError
+
+        monkeypatch.setattr(container_module.metadata, "version", _raise)
+        assert container_module._default_tag() == "latest"
+
+
+class TestGetClient:
+    """Tests for the get_client convenience helper."""
+
+    def test_get_client_returns_configured_client(self):
+        """get_client returns a MockServerClient pointed at the mapped host/port."""
+        from mockserver import MockServerClient
+
+        container = MockServerContainer()
+        container.get_container_host_ip = lambda: "127.0.0.1"
+        container.get_exposed_port = lambda port: 49152
+
+        client = container.get_client()
+        assert isinstance(client, MockServerClient)
+
+    def test_get_client_is_cached(self):
+        """get_client caches the client across calls."""
+        container = MockServerContainer()
+        container.get_container_host_ip = lambda: "127.0.0.1"
+        container.get_exposed_port = lambda port: 49152
+
+        assert container.get_client() is container.get_client()