Rename to ServerContainer

Author: Tranquility2

core/README.rst

@@ -7,7 +7,7 @@ testcontainers-core
 
 .. autoclass:: testcontainers.core.image.DockerImage
 
-.. autoclass:: testcontainers.core.generic.SrvContainer
+.. autoclass:: testcontainers.core.generic.ServerContainer
 
 Using `DockerContainer` and `DockerImage` directly:
 

core/testcontainers/core/generic.py

@@ -84,7 +84,7 @@ def _transfer_seed(self) -> None:
         pass
 
 
-class SrvContainer(DockerContainer):
+class ServerContainer(DockerContainer):
     """
     Container for a generic server that is based on a custom image.
 
@@ -93,10 +93,10 @@ class SrvContainer(DockerContainer):
     .. doctest::
 
         >>> import httpx
-        >>> from testcontainers.core.generic import SrvContainer
+        >>> from testcontainers.core.generic import ServerContainer
         >>> from testcontainers.core.waiting_utils import wait_for_logs
 
-        >>> with SrvContainer(path="./core/tests/image_fixtures/python_server", port=9000, tag="test-srv:latest") as srv:
+        >>> with ServerContainer(path="./core/tests/image_fixtures/python_server", port=9000, tag="test-srv:latest") as srv:
         ...     url = srv._create_connection_url()
         ...     response = httpx.get(f"{url}", timeout=5)
         ...     assert response.status_code == 200, "Response status code is not 200"
@@ -138,7 +138,7 @@ def _create_connection_url(self) -> str:
         url = f"http://{host}:{exposed_port}"
         return url
 
-    def start(self) -> "SrvContainer":
+    def start(self) -> "ServerContainer":
         super().start()
         self._connect()
         return self

core/tests/test_generics.py

@@ -1,14 +1,14 @@
 import pytest
 from typing import Optional
-from testcontainers.core.generic import SrvContainer
+from testcontainers.core.generic import ServerContainer
 
 import re
 
 
 @pytest.mark.parametrize("test_image_cleanup", [True, False])
 @pytest.mark.parametrize("test_image_tag", [None, "custom-image:test"])
 def test_srv_container(test_image_tag: Optional[str], test_image_cleanup: bool, check_for_image, port=9000):
-    with SrvContainer(
+    with ServerContainer(
         path="./core/tests/image_fixtures/python_server",
         port=port,
         tag=test_image_tag,