make cancellation details non-optional for testing activity env

Author: THardy98

temporalio/testing/_activity.py

@@ -80,24 +80,21 @@ def __init__(self) -> None:
 
     def cancel(
         self,
-        cancellation_details: Optional[
-            temporalio.activity.ActivityCancellationDetails
-        ] = None,
+        cancellation_details: temporalio.activity.ActivityCancellationDetails,
     ) -> None:
         """Cancel the activity.
 
         Args:
-            cancellation_details: Optional details about the cancellation. When provided, these
-                will be accessible through temporalio.activity.cancellation_details()
+            cancellation_details: details about the cancellation. These will
+                be accessible through temporalio.activity.cancellation_details()
                 in the activity after cancellation.
 
         This only has an effect on the first call.
         """
         if self._cancelled:
             return
         self._cancelled = True
-        if cancellation_details:
-            self._cancellation_details.details = cancellation_details
+        self._cancellation_details.details = cancellation_details
         for act in self._activities:
             act.cancel()
 

tests/testing/test_activity.py

@@ -26,7 +26,11 @@ async def via_create_task():
             await asyncio.Future()
             raise RuntimeError("Unreachable")
         except asyncio.CancelledError:
-            activity.heartbeat("cancelled")
+            cancellation_details = activity.cancellation_details()
+            if cancellation_details:
+                activity.heartbeat(
+                    f"cancelled={cancellation_details.cancel_requested}",
+                )
         return "done"
 
     env = ActivityEnvironment()
@@ -37,9 +41,11 @@ async def via_create_task():
     task = asyncio.create_task(env.run(do_stuff, "param1"))
     await waiting.wait()
     # Cancel and confirm done
-    env.cancel()
+    env.cancel(
+        cancellation_details=activity.ActivityCancellationDetails(cancel_requested=True)
+    )
     assert "done" == await task
-    assert heartbeats == ["param: param1", "task, type: unknown", "cancelled"]
+    assert heartbeats == ["param: param1", "task, type: unknown", "cancelled=True"]
 
 
 def test_activity_env_sync():
@@ -72,7 +78,11 @@ def via_thread():
                     raise RuntimeError("Unexpected")
         except CancelledError:
             nonlocal properly_cancelled
-            properly_cancelled = True
+            cancellation_details = activity.cancellation_details()
+            if cancellation_details:
+                properly_cancelled = cancellation_details.cancel_requested
+            else:
+                properly_cancelled = False
 
     env = ActivityEnvironment()
     # Set heartbeat handler to add to list
@@ -84,7 +94,9 @@ def via_thread():
     waiting.wait()
     # Cancel and confirm done
     time.sleep(1)
-    env.cancel()
+    env.cancel(
+        cancellation_details=activity.ActivityCancellationDetails(cancel_requested=True)
+    )
     thread.join()
     assert heartbeats == ["param: param1", "task, type: unknown"]
     assert properly_cancelled