fix tests

Author: uosis

podman_compose.py

@@ -2058,17 +2058,17 @@ def resolve_pod_name(self) -> str | None:
         # - docker-compose.yml x-podman.in_pod
         # - Default value of true
         in_pod_arg = self.global_args.in_pod or self.x_podman.get(
-            PodmanCompose.XPodmanSettingKey.IN_POD, True)
+            PodmanCompose.XPodmanSettingKey.IN_POD, True
+        )
 
         in_pod_arg_parsed = try_parse_bool(in_pod_arg)
         if in_pod_arg_parsed is True:
             return f"pod_{self.project_name}"
-        elif in_pod_arg_parsed is False:
+        if in_pod_arg_parsed is False:
             return None
-        else:
-            # Arg is a non-emty string that does not parse to a boolean,
-            # so we treat it as a pod name.
-            return in_pod_arg
+        # Arg is a non-emty string that does not parse to a boolean,
+        # so we treat it as a pod name.
+        return in_pod_arg
 
     def resolve_pod_args(self) -> list[str]:
         # Priorities:
@@ -2087,10 +2087,10 @@ def join_name_parts(self, *parts: str) -> str:
             sep = "-"
         else:
             sep = "_"
-
         return sep.join(parts)
 
     def format_name(self, *parts: str) -> str:
+        assert self.project_name is not None
         return self.join_name_parts(self.project_name, *parts)
 
     def _parse_x_podman_settings(self, compose: dict[str, Any], environ: dict[str, str]) -> None:
@@ -2942,15 +2942,15 @@ async def pod_exists(compose: PodmanCompose, name: str) -> bool:
     return exit_code == 0
 
 
-async def create_pods(compose: PodmanCompose, args: argparse.Namespace) -> None:
+async def create_pods(compose: PodmanCompose) -> None:
     for pod in compose.pods:
         if await pod_exists(compose, pod["name"]):
             continue
 
         podman_args = [
             "create",
             "--name=" + pod["name"],
-        ]+ compose.resolve_pod_args()
+        ] + compose.resolve_pod_args()
 
         ports = pod.get("ports", [])
         if isinstance(ports, str):
@@ -3084,7 +3084,7 @@ async def compose_up(compose: PodmanCompose, args: argparse.Namespace) -> int |
         log.info("recreating: done\n\n")
     # args.no_recreate disables check for changes (which is not implemented)
 
-    await create_pods(compose, args)
+    await create_pods(compose)
     exit_code = 0
     for cnt in compose.containers:
         if cnt["_service"] in excluded:
@@ -3328,7 +3328,7 @@ async def compose_ps(compose: PodmanCompose, args: argparse.Namespace) -> None:
     "create a container similar to a service to run a one-off command",
 )
 async def compose_run(compose: PodmanCompose, args: argparse.Namespace) -> None:
-    await create_pods(compose, args)
+    await create_pods(compose)
     compose.assert_services(args.service)
     container_names = compose.container_names_by_service[args.service]
     container_name = container_names[0]
@@ -3373,7 +3373,7 @@ def compose_run_update_container_from_args(
     compose: PodmanCompose, cnt: dict, args: argparse.Namespace
 ) -> None:
     # adjust one-off container options
-    name0 = compose.format_name(args.service, str(random.randrange(0, 65536)))
+    name0 = compose.format_name(args.service, f'tmp{random.randrange(0, 65536)}')
     cnt["name"] = args.name or name0
     if args.entrypoint:
         cnt["entrypoint"] = args.entrypoint

tests/integration/name_separator_compat/test_podman_compose_name_separator_compat.py

@@ -12,17 +12,16 @@
 
 class TestComposeNameSeparatorCompat(unittest.TestCase, RunSubprocessMixin):
     @parameterized.expand([
-        ('default', { }, '_'),
-        ('default', { 'PODMAN_COMPOSE_NAME_SEPARATOR_COMPAT': '1' }, '-'),
-        ('compat', { }, '-'),
-        ('compat', { 'PODMAN_COMPOSE_NAME_SEPARATOR_COMPAT': '1' }, '-'),
-        ('compat', { 'PODMAN_COMPOSE_NAME_SEPARATOR_COMPAT': '0' }, '_'),
+        ('default', {}, '_'),
+        ('default', {'PODMAN_COMPOSE_NAME_SEPARATOR_COMPAT': '1'}, '-'),
+        ('compat', {}, '-'),
+        ('compat', {'PODMAN_COMPOSE_NAME_SEPARATOR_COMPAT': '1'}, '-'),
+        ('compat', {'PODMAN_COMPOSE_NAME_SEPARATOR_COMPAT': '0'}, '_'),
     ])
     def test_container_name(self, file: str, env: dict[str, str], expected_sep: str) -> None:
         compose_yaml_path = os.path.join(
-            test_path(),
-            "name_separator_compat",
-            f"docker-compose_{file}.yaml")
+            test_path(), "name_separator_compat", f"docker-compose_{file}.yaml"
+        )
 
         try:
             self.run_subprocess_assert_returncode(
@@ -47,11 +46,14 @@ def test_container_name(self, file: str, env: dict[str, str], expected_sep: str)
 
             self.assertEqual(container_name, expected_container_name)
         finally:
-            self.run_subprocess_assert_returncode([
-                podman_compose_path(),
-                "-f",
-                compose_yaml_path,
-                "down",
-                "-t",
-                "0",
-            ], env=env)
+            self.run_subprocess_assert_returncode(
+                [
+                    podman_compose_path(),
+                    "-f",
+                    compose_yaml_path,
+                    "down",
+                    "-t",
+                    "0",
+                ],
+                env=env,
+            )

tests/unit/test_compose_run_update_container_from_args.py

@@ -56,7 +56,9 @@ def get_minimal_container() -> dict:
 
 
 def get_minimal_compose() -> PodmanCompose:
-    return PodmanCompose()
+    compose = PodmanCompose()
+    compose.project_name = "test_project"
+    return compose
 
 
 def get_minimal_args() -> argparse.Namespace:
@@ -67,7 +69,7 @@ def get_minimal_args() -> argparse.Namespace:
         env=None,
         name="default_name",
         rm=None,
-        service=None,
+        service="test_service",
         publish=None,
         service_ports=None,
         user=None,

tests/unit/test_container_to_args.py

@@ -20,6 +20,8 @@ def create_compose_mock(project_name: str = "test_project_name") -> PodmanCompos
     compose.default_net = None
     compose.networks = {}
     compose.x_podman = {}
+    compose.join_name_parts = mock.Mock(side_effect=lambda *args: '_'.join(args))
+    compose.format_name = mock.Mock(side_effect=lambda *args: '_'.join([project_name, *args]))
 
     async def podman_output(*args: Any, **kwargs: Any) -> None:
         pass