spelling and split out dataclass

Author: rhoban13

core/testcontainers/core/container.py

@@ -21,6 +21,7 @@
 from testcontainers.core.exceptions import ContainerConnectException, ContainerStartException
 from testcontainers.core.labels import LABEL_SESSION_ID, SESSION_ID
 from testcontainers.core.network import Network
+from testcontainers.core.transferable import Transferable
 from testcontainers.core.utils import is_arm, setup_logger
 from testcontainers.core.waiting_utils import wait_container_is_ready, wait_for_logs
 
@@ -35,13 +36,6 @@ class Mount(TypedDict):
     mode: str
 
 
-@dataclasses.dataclass
-class Transferrable:
-    source: Union[bytes, PathLike]
-    destination_in_container: str
-    mode: int = 0o644
-
-
 class DockerContainer:
     """
     Basic container object to spin up Docker instances.
@@ -80,7 +74,7 @@ def __init__(
         volumes: Optional[list[tuple[str, str, str]]] = None,
         network: Optional[Network] = None,
         network_aliases: Optional[list[str]] = None,
-        transferrables: Optional[tuple[Transferrable]] = None,
+        transferrables: Optional[list[Transferable]] = None,
         **kwargs: Any,
     ) -> None:
         self.env = env or {}
@@ -108,7 +102,7 @@ def __init__(
             self.with_network_aliases(*network_aliases)
 
         self._kwargs = kwargs
-        self._transferrables = transferrables or []
+        self._transferables: list[Transferable] = transferrables or []
 
     def with_env(self, key: str, value: str) -> Self:
         self.env[key] = value
@@ -210,7 +204,7 @@ def start(self) -> Self:
 
         logger.info("Container started: %s", self._container.short_id)
 
-        for t in self._transferrables:
+        for t in self._transferables:
             self._transfer_into_container(t.source, t.destination_in_container, t.mode)
 
         return self
@@ -293,10 +287,10 @@ def _configure(self) -> None:
     def with_copy_into_container(
         self, file_content: bytes | PathLike, destination_in_container: str, mode: int = 0o644
     ):
-        self._transferrables.append(Transferrable(file_content, destination_in_container, mode))
+        self._transferables.append(Transferable(file_content, destination_in_container, mode))
         return self
 
-    def copy_into_container(self, file_content: bytes, destination_in_container: str, mode: int = 0o644):
+    def copy_into_container(self, file_content: bytes | PathLike, destination_in_container: str, mode: int = 0o644):
         return self._transfer_into_container(file_content, destination_in_container, mode)
 
     def _transfer_into_container(self, source: bytes | PathLike, destination_in_container: str, mode: int):

core/testcontainers/core/transferable.py

@@ -0,0 +1,10 @@
+import dataclasses
+import os
+from typing import Union
+
+
+@dataclasses.dataclass
+class Transferable:
+    source: Union[bytes, os.PathLike]
+    destination_in_container: str
+    mode: int = 0o644

core/tests/test_core.py

@@ -1,7 +1,8 @@
 import tempfile
 from pathlib import Path
 
-from testcontainers.core.container import DockerContainer, Transferrable
+from testcontainers.core.container import DockerContainer
+from testcontainers.core.transferable import Transferable
 
 
 def test_garbage_collection_is_defensive():
@@ -89,7 +90,7 @@ def test_copy_file_into_container_via_initializer(tmp_path: Path):
     destination_in_container = "/tmp/my_file"
 
     with DockerContainer(
-        "bash", command="sleep infinity", transferrables=(Transferrable(my_file, destination_in_container),)
+        "bash", command="sleep infinity", transferrables=(Transferable(my_file, destination_in_container),)
     ) as container:
         # When
         result = container.exec(f"cat {destination_in_container}")
@@ -138,7 +139,7 @@ def test_copy_bytes_to_container_via_initializer():
     destination_in_container = "/tmp/my_file"
 
     with DockerContainer(
-        "bash", command="sleep infinity", transferrables=(Transferrable(file_content, destination_in_container),)
+        "bash", command="sleep infinity", transferrables=(Transferable(file_content, destination_in_container),)
     ) as container:
         # When
         result = container.exec(f"cat {destination_in_container}")