refactor: make service batching and tests more pythonic

Author: vertti

src/lazy_ecs/features/service/service.py

@@ -31,10 +31,11 @@ def get_service_info(self, cluster_name: str) -> list[ServiceInfo]:
         if not service_names:
             return []
 
-        all_services = []
-        for batch in batch_items(service_names, 10):
-            response = self.ecs_client.describe_services(cluster=cluster_name, services=batch)
-            all_services.extend(response.get("services", []))
+        all_services = [
+            service
+            for batch in batch_items(service_names, 10)
+            for service in self.ecs_client.describe_services(cluster=cluster_name, services=batch).get("services", [])
+        ]
 
         return [_create_service_info(service) for service in all_services]
 

tests/test_aws_service.py

@@ -290,9 +290,8 @@ def test_get_service_info_with_more_than_10_services():
         service_info = service.get_service_info("production")
 
         assert len(service_info) == 15
-        service_names = [info["name"] for info in service_info]
-        for i in range(15):
-            assert any(f"service-{i:02d}" in name for name in service_names)
+        service_names = {info["name"] for info in service_info}
+        assert all(any(f"service-{i:02d}" in name for name in service_names) for i in range(15))
 
 
 def test_get_tasks(ecs_client_with_tasks) -> None:

tests/test_utils.py

@@ -4,57 +4,36 @@
 
 
 def test_batch_items_basic():
-    items = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-    batches = list(batch_items(items, 3))
+    batches = list(batch_items([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 3))
 
-    assert len(batches) == 4
-    assert batches[0] == [1, 2, 3]
-    assert batches[1] == [4, 5, 6]
-    assert batches[2] == [7, 8, 9]
-    assert batches[3] == [10]
+    assert batches == [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10]]
 
 
 def test_batch_items_exact_fit():
-    items = [1, 2, 3, 4, 5, 6]
-    batches = list(batch_items(items, 3))
+    batches = list(batch_items([1, 2, 3, 4, 5, 6], 3))
 
-    assert len(batches) == 2
-    assert batches[0] == [1, 2, 3]
-    assert batches[1] == [4, 5, 6]
+    assert batches == [[1, 2, 3], [4, 5, 6]]
 
 
 def test_batch_items_single_batch():
-    items = [1, 2, 3]
-    batches = list(batch_items(items, 10))
+    batches = list(batch_items([1, 2, 3], 10))
 
-    assert len(batches) == 1
-    assert batches[0] == [1, 2, 3]
+    assert batches == [[1, 2, 3]]
 
 
 def test_batch_items_empty_list():
-    items = []
-    batches = list(batch_items(items, 5))
+    batches = list(batch_items([], 5))
 
-    assert len(batches) == 0
+    assert batches == []
 
 
 def test_batch_items_size_one():
-    items = [1, 2, 3, 4, 5]
-    batches = list(batch_items(items, 1))
+    batches = list(batch_items([1, 2, 3, 4, 5], 1))
 
-    assert len(batches) == 5
-    assert batches[0] == [1]
-    assert batches[1] == [2]
-    assert batches[2] == [3]
-    assert batches[3] == [4]
-    assert batches[4] == [5]
+    assert batches == [[1], [2], [3], [4], [5]]
 
 
 def test_batch_items_strings():
-    items = ["a", "b", "c", "d", "e", "f", "g"]
-    batches = list(batch_items(items, 3))
+    batches = list(batch_items(["a", "b", "c", "d", "e", "f", "g"], 3))
 
-    assert len(batches) == 3
-    assert batches[0] == ["a", "b", "c"]
-    assert batches[1] == ["d", "e", "f"]
-    assert batches[2] == ["g"]
+    assert batches == [["a", "b", "c"], ["d", "e", "f"], ["g"]]