Fixed build unit test

Author: angela-ko

Diff for: tesseract_core/sdk/docker_cli_wrapper.py

@@ -51,6 +51,10 @@ def get(self, image: str) -> Image:
             # have id or name matching the image str
 
             # Use getter func to make sure it's updated
+            if not image:
+                raise CLIDockerClient.Errors.DockerException(
+                    "Image name cannot be empty."
+                )
             if ":" not in image:
                 image = image + ":latest"
             images = self.list()
@@ -419,7 +423,7 @@ def _project_containers(
                 A list of Docker container ids.
             """
             # Calling self.get_projects will update containers and projects map
-            if project_id in self.get_projects():
+            if project_id in self.list():
                 return self.project_container_map[project_id]
             try:
                 # Run the docker ps command to list containers

Diff for: tesseract_core/sdk/engine.py

@@ -98,12 +98,14 @@ def needs_docker(func: Callable) -> Callable:
     @functools.wraps(func)
     def wrapper_needs_docker(*args: Any, **kwargs: Any) -> None:
         try:
+            print("AKOAKO needs docker")
             docker_client.info()
-        except RuntimeError as ex:
-            message = "Could not reach Docker daemon, check if it is running."
-            logger.error(f"{message} Details: {ex}")
-            raise RuntimeError(f"{message} See logs for details.") from None
-
+        except CLIDockerClient.Errors.APIError as ex:
+            print("AKOAKO raise")
+            raise UserError(
+                "Could not reach Docker daemon, check if it is running."
+            ) from ex
+        print("AKOAKO return")
         return func(*args, **kwargs)
 
     return wrapper_needs_docker

Diff for: tests/conftest.py

@@ -230,7 +230,6 @@ def attrs(self):
 
         def logs(self, stderr=False, stdout=False, **kwargs: Any):
             """Mock logs method for Container."""
-            print("AKOAKO logs")
             out = []
             if stdout:
                 out.append(json.dumps(self.return_args).encode("utf-8"))
@@ -240,25 +239,26 @@ def logs(self, stderr=False, stdout=False, **kwargs: Any):
 
     created_ids = set()
 
-    class MockedDocker(docker_cli_wrapper.CLIDockerClient):
-        """Mock DockerWrapper class."""
+    class MockedDocker:
+        """Mock CLIDockerClient class."""
 
-        @staticmethod
         def info():
             """Mock info method for DockerClient."""
+            print("AKOAKO mocked info")
             pass
 
         class images:
-            """Mock of DockerWrapper.images."""
+            """Mock of CLIDockerClient.images."""
 
             @staticmethod
             def get(name: str) -> None:
-                """Mock of DockerWrapper.images.pull."""
+                """Mock of CLIDockerClient.Images.get."""
+                print("AKOAKO GET FUNCTION")
                 return MockedDocker.images.list()[0]
 
             @staticmethod
             def list() -> list[docker_cli_wrapper.CLIDockerClient.Images.Image]:
-                """Mock of DockerWrapper.get_all_images."""
+                """Mock of CLIDockerClient.Images.list."""
                 return [
                     docker_cli_wrapper.CLIDockerClient.Images.Image(
                         {
@@ -285,12 +285,12 @@ def buildx(*args, **kwargs) -> str:
         class containers:
             @staticmethod
             def get(name: str) -> MockedContainer:
-                """Mock of DockerWrapper.get_container."""
+                """Mock of CLIDockerClient.Containers.get."""
                 return MockedDocker.containers.list()[0]
 
             @staticmethod
             def list() -> list[MockedContainer]:
-                """Mock of DockerWrapper.get_all_containers."""
+                """Mock of CLIDockerClient.Containers.list."""
                 return [MockedContainer({"TESSERACT_NAME": "vectoradd"})]
 
             @staticmethod
@@ -305,19 +305,19 @@ def list() -> dict:
 
             @staticmethod
             def up(compose_fpath: str, project_name: str) -> str:
-                """Mock of CLIDockerClient.docker_compose_up."""
+                """Mock of CLIDockerClient.Compose.up."""
                 created_ids.add(project_name)
                 return project_name
 
             @staticmethod
             def down(project_id: str) -> bool:
-                """Mock of CLIDockerClient.docker_compose_down."""
+                """Mock of CLIDockerClient.Compose.down."""
                 created_ids.remove(project_id)
                 return True
 
             @staticmethod
             def exists(project_id: str) -> bool:
-                """Mock of CLIDockerClient.docker_compose_project_exists."""
+                """Mock of CLIDockerClient.Compose.exists."""
                 return project_id in created_ids
 
     def mocked_subprocess_run(*args, **kwargs):

Diff for: tests/sdk_tests/test_engine.py

@@ -7,6 +7,7 @@
 import random
 import time
 from pathlib import Path
+from unittest.mock import Mock
 
 import pytest
 import yaml
@@ -238,7 +239,7 @@ def test_serve_tesseracts(mocked_docker):
     assert project_name_multi_tesseract
 
 
-def test_needs_docker(mocked_docker, mocker):
+def test_needs_docker(mocked_docker):
     @engine.needs_docker
     def run_something_with_docker():
         pass
@@ -247,10 +248,7 @@ def run_something_with_docker():
     run_something_with_docker()
 
     # Sad case
-    docker_info = mocker.patch(
-        "tesseract_core.sdk.docker_cli_wrapper.CLIDockerClient.info"
-    )
-    docker_info.side_effect = UserError("No Docker")
+    mocked_docker.info = Mock(side_effect=UserError())
 
     with pytest.raises(UserError):
         run_something_with_docker()