fix tests

Author: snopoke

tests/test_celery.py

@@ -139,14 +139,14 @@ def add_with_task_args(self, a, b):
     create.assert_called_once_with(
         "new_name",
         value_max=10,
-        data={"foo": "bar", "celery_task_args": (2, 2), "celery_task_kwargs": {}},
+        data={"foo": "bar", "celery_task_args": [2, 2], "celery_task_kwargs": {}},
         status=StatusEnum.PENDING,
     )
 
 
 def test_celery_record_task_kwargs(celery_session_app, celery_session_worker, bind_settings):
     @celery_session_app.task(bind=True, base=Task)
-    def add_with_task_args(self, a, b, c=0):
+    def add_with_task_kwargs(self, a, b, c=0):
         assert self.taskbadger_task is not None
         return a + b + c
 
@@ -160,7 +160,7 @@ def add_with_task_args(self, a, b, c=0):
         create.return_value = task_for_test()
 
         actions = [Action("stale", integration=EmailIntegration(to="test@test.com"))]
-        result = add_with_task_args.delay(
+        result = add_with_task_kwargs.delay(
             2,
             2,
             c=3,
@@ -174,7 +174,7 @@ def add_with_task_args(self, a, b, c=0):
     create.assert_called_once_with(
         "new_name",
         value_max=10,
-        data={"celery_task_args": (2, 2), "celery_task_kwargs": {"c": 3}},
+        data={"celery_task_args": [2, 2], "celery_task_kwargs": {"c": 3}},
         actions=actions,
         status=StatusEnum.PENDING,
     )
@@ -189,7 +189,7 @@ def __init__(self, a, b):
     register_type(A, "A", lambda o: [o.a, o.b], lambda o: A(*o))
 
     @celery_session_app.task(bind=True, base=Task)
-    def add_with_task_args(self, a):
+    def add_task_custom_serialization(self, a):
         assert self.taskbadger_task is not None
         return a.a + a.b
 
@@ -202,14 +202,14 @@ def add_with_task_args(self, a):
     ):
         create.return_value = task_for_test()
 
-        result = add_with_task_args.delay(
+        result = add_task_custom_serialization.delay(
             A(2, 2),
             taskbadger_record_task_args=True,
         )
         assert result.get(timeout=10, propagate=True) == 4
 
     create.assert_called_once_with(
-        "tests.test_celery.add_with_task_args",
+        "tests.test_celery.add_task_custom_serialization",
         data={"celery_task_args": [{"__type__": "A", "__value__": [2, 2]}], "celery_task_kwargs": {}},
         status=StatusEnum.PENDING,
     )

tests/test_celery_system_integration.py

@@ -115,7 +115,7 @@ def test_celery_record_task_args_local_override(celery_session_app, celery_sessi
     """Test that passing `taskbadger_record_task_args` overrides the integration value"""
 
     @celery_session_app.task(bind=True, base=Task)
-    def add_normal(self, a, b):
+    def add_normal_with_override(self, a, b):
         assert self.request.get("taskbadger_task_id") is not None, "missing task in request"
         assert hasattr(self, "taskbadger_task")
         assert Badger.current.session().client is not None, "missing client"
@@ -133,11 +133,13 @@ def add_normal(self, a, b):
     ):
         tb_task = task_for_test()
         create.return_value = tb_task
-        result = add_normal.delay(2, 2, taskbadger_record_task_args=False)
+        result = add_normal_with_override.delay(2, 2, taskbadger_record_task_args=False)
         assert result.info.get("taskbadger_task_id") == tb_task.id
         assert result.get(timeout=10, propagate=True) == 4
 
-    create.assert_called_once_with("tests.test_celery_system_integration.add_normal", status=StatusEnum.PENDING)
+    create.assert_called_once_with(
+        "tests.test_celery_system_integration.add_normal_with_override", status=StatusEnum.PENDING
+    )
     assert get_task.call_count == 1
     assert update.call_count == 2
     assert Badger.current.session().client is None