refactor: extract channel type cleanup into reusable decorator

Author: aliev

tests/base.py

@@ -1,4 +1,6 @@
+import datetime
 import functools
+import inspect
 import time
 from abc import ABC
 
@@ -90,3 +92,44 @@ def wrapper(*args, **kwargs):
         return wrapper
 
     return decorator
+
+
+_BUILTIN_CHANNEL_TYPES = frozenset(
+    {"messaging", "livestream", "team", "gaming", "commerce"}
+)
+_STALE_THRESHOLD = datetime.timedelta(minutes=2)
+
+
+def cleanup_channel_types(func):
+    """Decorator that deletes stale test channel types before the test runs.
+
+    Frees slots toward the 50-type limit without interfering with parallel
+    runners (only removes types older than 2 minutes).  Expects a ``client``
+    pytest fixture parameter.
+    """
+
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        # Resolve 'client' from pytest kwargs or positional args
+        client = kwargs.get("client")
+        if client is None:
+            sig = inspect.signature(func)
+            params = list(sig.parameters)
+            idx = params.index("client") if "client" in params else 0
+            client = args[idx]
+
+        now = datetime.datetime.now(datetime.timezone.utc)
+        resp = client.chat.list_channel_types()
+        for name, config in resp.data.channel_types.items():
+            if name in _BUILTIN_CHANNEL_TYPES:
+                continue
+            if config and (now - config.created_at) > _STALE_THRESHOLD:
+                try:
+                    client.chat.delete_channel_type(name=name)
+                except Exception:
+                    pass
+        time.sleep(2)
+
+        return func(*args, **kwargs)
+
+    return wrapper

tests/test_chat_misc.py

@@ -1,4 +1,3 @@
-import datetime
 import time
 import uuid
 
@@ -18,7 +17,7 @@
     QueryFutureChannelBansPayload,
     SortParamRequest,
 )
-from tests.base import retry_on_transient_error
+from tests.base import cleanup_channel_types, retry_on_transient_error
 
 
 def test_get_app_settings(client: Stream):
@@ -391,42 +390,10 @@ def test_query_future_channel_bans(client: Stream, random_users):
             pass
 
 
-BUILTIN_CHANNEL_TYPES = frozenset(
-    {
-        "messaging",
-        "livestream",
-        "team",
-        "gaming",
-        "commerce",
-    }
-)
-
-_STALE_THRESHOLD = datetime.timedelta(minutes=2)
-
-
-def _cleanup_test_channel_types(client: Stream):
-    """Delete stale non-builtin channel types to free slots for test runs.
-
-    Only deletes types older than 2 minutes to avoid interfering with
-    parallel runners that just created theirs.
-    """
-    now = datetime.datetime.now(datetime.timezone.utc)
-    resp = client.chat.list_channel_types()
-    for name, config in resp.data.channel_types.items():
-        if name in BUILTIN_CHANNEL_TYPES:
-            continue
-        if config and (now - config.created_at) > _STALE_THRESHOLD:
-            try:
-                client.chat.delete_channel_type(name=name)
-            except Exception:
-                pass
-    time.sleep(2)
-
-
+@cleanup_channel_types
 @retry_on_transient_error()
 def test_create_channel_type(client: Stream):
     """Create a channel type with custom settings."""
-    _cleanup_test_channel_types(client)
     type_name = f"testtype{uuid.uuid4().hex[:8]}"
 
     try:
@@ -449,10 +416,10 @@ def test_create_channel_type(client: Stream):
             pass
 
 
+@cleanup_channel_types
 @retry_on_transient_error()
 def test_update_channel_type_mark_messages_pending(client: Stream):
     """Update a channel type with mark_messages_pending=True."""
-    _cleanup_test_channel_types(client)
     type_name = f"testtype{uuid.uuid4().hex[:8]}"
 
     try:
@@ -483,10 +450,10 @@ def test_update_channel_type_mark_messages_pending(client: Stream):
             pass
 
 
+@cleanup_channel_types
 @retry_on_transient_error()
 def test_update_channel_type_push_notifications(client: Stream):
     """Update a channel type with push_notifications=False."""
-    _cleanup_test_channel_types(client)
     type_name = f"testtype{uuid.uuid4().hex[:8]}"
 
     try:
@@ -517,10 +484,10 @@ def test_update_channel_type_push_notifications(client: Stream):
             pass
 
 
+@cleanup_channel_types
 @retry_on_transient_error()
 def test_delete_channel_type(client: Stream):
     """Create and delete a channel type with retry."""
-    _cleanup_test_channel_types(client)
     type_name = f"testdeltype{uuid.uuid4().hex[:8]}"
 
     client.chat.create_channel_type(