Skip to content

Commit 8df1df9

Browse files
fix mypy errors
1 parent 6e48502 commit 8df1df9

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

podman_compose.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2745,7 +2745,7 @@ async def list_running_projects(compose: PodmanCompose, args: argparse.Namespace
27452745
img_containers = [cnt for cnt in compose.containers if "image" in cnt]
27462746
parsed_args = vars(args)
27472747
_format = parsed_args.get("format", "table")
2748-
data = []
2748+
data: list[Any] = []
27492749
if _format == "table":
27502750
data.append(["NAME", "STATUS", "CONFIG_FILES"])
27512751

@@ -2766,13 +2766,13 @@ async def list_running_projects(compose: PodmanCompose, args: argparse.Namespace
27662766
''',
27672767
],
27682768
)
2769-
output = output.decode().split()
2770-
running = bool(json.loads(output[1]))
2771-
status = "{}({})".format(output[0], 1 if running else 0)
2772-
path = "{}/{}".format(output[2], output[3])
2769+
command_output = output.decode().split()
2770+
running = bool(json.loads(command_output[1]))
2771+
status = "{}({})".format(command_output[0], 1 if running else 0)
2772+
path = "{}/{}".format(command_output[2], command_output[3])
27732773

27742774
if _format == "table":
2775-
if isinstance(output, list):
2775+
if isinstance(command_output, list):
27762776
data.append([name, status, path])
27772777

27782778
elif _format == "json":

tests/integration/list/test_podman_compose_list.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import ast
22
import os
33
import unittest
4+
from typing import Union
45

56
from tests.integration.test_utils import RunSubprocessMixin
67
from tests.integration.test_utils import podman_compose_path
@@ -52,14 +53,15 @@ def test_podman_compose_list(self) -> None:
5253
]
5354

5455
command_down = ["podman", "rm", "--force"]
56+
service: Union[dict[str, str], str]
5557

5658
running_containers = []
5759
self.run_subprocess_assert_returncode(command_up)
5860
out, _ = self.run_subprocess_assert_returncode(command_list)
59-
out = out.decode()
61+
str_out = out.decode()
6062

6163
# Test for table view
62-
services = out.strip().split("\n")
64+
services = str_out.strip().split("\n")
6365
headers = [h.strip() for h in services[0].split("\t")]
6466

6567
for service in services[1:]:
@@ -74,16 +76,17 @@ def test_podman_compose_list(self) -> None:
7476
# Test for json view
7577
command_list.extend(["--format", "json"])
7678
out, _ = self.run_subprocess_assert_returncode(command_list)
77-
out = out.decode()
78-
services = ast.literal_eval(out)
79+
str_out = out.decode()
80+
json_services: list[dict] = ast.literal_eval(str_out)
81+
self.assertIsInstance(json_services, list)
7982

80-
for service in services:
83+
for service in json_services:
8184
self.assertIsInstance(service, dict)
8285
self.assertNotEqual(service.get("Name"), None)
8386
self.assertNotEqual(service.get("Status"), None)
8487
self.assertNotEqual(service.get("ConfigFiles"), None)
8588

86-
self.assertEqual(len(services), 3)
89+
self.assertEqual(len(json_services), 3)
8790

8891
# Get container ID to remove it
8992
out, _ = self.run_subprocess_assert_returncode(command_container_id)

0 commit comments

Comments
 (0)