localstack
diff --git a/‎localstack-core/localstack/utils/batch_policy.py
Lines changed: 10 additions & 9 deletions b/‎localstack-core/localstack/utils/batch_policy.py
Lines changed: 10 additions & 9 deletions
diff --git a/‎tests/unit/utils/test_batch_policy.py
Lines changed: 13 additions & 3 deletions b/‎tests/unit/utils/test_batch_policy.py
Lines changed: 13 additions & 3 deletions
@@ -29,22 +29,22 @@ class Batcher(Generic[T]):
 
         # Triggers when 2 (or more) items are added
         batcher = Batcher(max_count=2)
-        assert batcher.add(["foo", "bar", "baz"])
-        assert batcher.flush() == ["foo", "bar", "baz"]
+        assert batcher.add(["item1", "item2", "item3"])
+        assert batcher.flush() == ["item1", "item2", "item3"]
 
         # Triggers partially when 2 (or more) items are added
         batcher = Batcher(max_count=2)
-        assert batcher.add(["foo", "bar", "baz"])
-        assert batcher.flush(partial=True) == ["foo", "bar"]
-        assert batcher.add("foobar")
-        assert batcher.flush(partial=True) == ["baz", "foobar"]
+        assert batcher.add(["item1", "item2", "item3"])
+        assert batcher.flush(partial=True) == ["item1", "item2"]
+        assert batcher.add("item4")
+        assert batcher.flush(partial=True) == ["item3", "item4"]
 
         # Trigger 2 seconds after the first add
         batcher = Batcher(max_window=2.0)
-        assert not batcher.add(["foo", "bar", "baz"])
+        assert not batcher.add(["item1", "item2", "item3"])
         time.sleep(2.1)
-        assert not batcher.add(["foobar"])
-        assert batcher.flush() == ["foo", "bar", "baz", "foobar"]
+        assert not batcher.add(["item4"])
+        assert batcher.flush() == ["item1", "item2", "item3", "item4"]
     """
 
     max_count: Optional[int] = Field(default=None, description="Maximum number of items", ge=0)
@@ -108,6 +108,7 @@ def flush(self, *, partial=False) -> list[T]:
 
         self._last_batch_time = time.monotonic()
         self._triggered = False
+        self._check_batch_policy()
 
         return result
 
 
@@ -1,5 +1,7 @@
 import time
 
+import pytest
+
 from localstack.utils.batch_policy import Batcher
 
 
@@ -122,8 +124,16 @@ def test_flush(self):
         assert result == ["item4"]
         assert batcher.get_current_size() == 0
 
-    def test_no_limits(self):
-        batcher = Batcher()
+    @pytest.mark.parametrize(
+        "max_count,max_window",
+        [(0, 10), (10, 0), (None, None)],
+    )
+    def test_no_limits(self, max_count, max_window):
+        if max_count or max_window:
+            batcher = Batcher(max_count=max_count, max_window=max_window)
+        else:
+            batcher = Batcher()
+
         assert batcher.is_triggered()  # no limit always returns true
 
         assert batcher.add("item1")
@@ -172,7 +182,7 @@ def test_deep_copy(self):
         original = {"key": "value"}
         batcher = Batcher(max_count=2)
 
-        batcher.add(original, cache_deep_copy=True)
+        batcher.add(original, deep_copy=True)
 
         original["key"] = "modified"