address pr suggestion

Author: THardy98

temporalio/bridge/src/client.rs

@@ -231,6 +231,7 @@ impl ClientRef {
                 }
                 "list_workflow_rules" => {
                     rpc_call!(retry_client, call, list_workflow_rules)
+                }
                 "patch_schedule" => {
                     rpc_call!(retry_client, call, patch_schedule)
                 }
@@ -324,13 +325,11 @@ impl ClientRef {
                 "terminate_workflow_execution" => {
                     rpc_call!(retry_client, call, terminate_workflow_execution)
                 }
-<<<<<<< HEAD
                 "trigger_workflow_rule" => {
                     rpc_call!(retry_client, call, trigger_workflow_rule)
-=======
+                }
                 "unpause_activity" => {
                     rpc_call!(retry_client, call, unpause_activity)
->>>>>>> 7e4b2d9 (add test for pause/unpause)
                 }
                 "update_namespace" => {
                     rpc_call_on_trait!(retry_client, call, WorkflowService, update_namespace)

temporalio/testing/_activity.py

@@ -80,7 +80,7 @@ def __init__(self) -> None:
 
     def cancel(
         self,
-        cancellation_details: temporalio.activity.ActivityCancellationDetails,
+        cancellation_details: temporalio.activity.ActivityCancellationDetails = temporalio.activity.ActivityCancellationDetails(cancel_requested=True),
     ) -> None:
         """Cancel the activity.
 

tests/helpers/__init__.py

@@ -273,4 +273,4 @@ async def check_unpaused() -> bool:
         info = await assert_pending_activity_exists_eventually(handle, activity_id)
         return not info.paused
 
-    await assert_eventually(check_unpaused)
+    await assert_eventually(check_unpaused)