unittest: add volume mount_type test

podman_compose.py needs to be modified to allow the tests to run.

In the assert_volume function, an exception was raised because
compose.podman.output returns None, and the code then tries to call
decode("utf-8") on it.

This change removes the unnecessary call to decode.

Signed-off-by: fccagou <me@fccagou.fr>

Author: fccagou

podman_compose.py

@@ -428,7 +428,8 @@ async def assert_volume(compose: PodmanCompose, mount_dict: dict[str, Any]) -> N
     # podman volume list --format '{{.Name}}\t{{.MountPoint}}' \
     #     -f 'label=io.podman.compose.project=HERE'
     try:
-        _ = (await compose.podman.output([], "volume", ["inspect", vol_name])).decode("utf-8")
+        await compose.podman.output([], "volume", ["inspect", vol_name])
+
     except subprocess.CalledProcessError as e:
         if is_ext:
             raise RuntimeError(f"External volume [{vol_name}] does not exist") from e
@@ -450,7 +451,7 @@ async def assert_volume(compose: PodmanCompose, mount_dict: dict[str, Any]) -> N
             args.extend(["--opt", f"{opt}={value}"])
         args.append(vol_name)
         await compose.podman.output([], "volume", args)
-        _ = (await compose.podman.output([], "volume", ["inspect", vol_name])).decode("utf-8")
+        await compose.podman.output([], "volume", ["inspect", vol_name])
 
 
 def mount_desc_to_mount_args(mount_desc: dict[str, Any]) -> str:

tests/unit/test_container_to_args.py

@@ -756,6 +756,49 @@ async def test_volumes_image_mount(
             ],
         )
 
+    @parameterized.expand([
+        (
+            "without_subpath",
+            {},
+            "type=volume,source=volname,destination=/mnt/example",
+        ),
+        (
+            "with_subpath",
+            {"volume": {"subpath": "path/to/image/folder"}},
+            "type=volume,source=volname,destination=/mnt/example,subpath=path/to/image/folder",
+        ),
+    ])
+    async def test_volumes_mount(
+        self, test_name: str, volume_opts: dict, expected_mount_arg: str
+    ) -> None:
+        c = create_compose_mock()
+        c.vols = {"volname": {"name": "volname"}}
+
+        cnt = get_minimal_container()
+        cnt["_service"] = cnt["service_name"]
+
+        cnt["volumes"] = [
+            {
+                "type": "volume",
+                "source": "volname",
+                "target": "/mnt/example",
+                **volume_opts,
+            },
+        ]
+
+        args = await container_to_args(c, cnt)
+        self.assertEqual(
+            args,
+            [
+                "--name=project_name_service_name1",
+                "-d",
+                "--mount",
+                expected_mount_arg,
+                "--network=bridge:alias=service_name",
+                "busybox",
+            ],
+        )
+
     @parameterized.expand([
         (
             "create_host_path_set_to_true",