Co-operatively cancel RPC Calls

OctopusDeploy · Dec 7, 2023 · e41c315 · e41c315
1 parent 0c38a57
commit e41c315
Show file tree

Hide file tree

Showing 30 changed files with 677 additions and 1,011 deletions.
diff --git a/source/Octopus.Tentacle.Client.Tests/RpcCallExecutorFixture.cs b/source/Octopus.Tentacle.Client.Tests/RpcCallExecutorFixture.cs
@@ -164,13 +164,13 @@ await AssertionExtensions.Should(
                             throw exception;
                         },
                         RetryDuration, clientOperationMetricsBuilder, cancellationToken))
-                .ThrowAsync<TaskCanceledException>();
+                .ThrowAsync<HalibutClientException>();
 
             // Assert
             var metric = rpcCallObserver.RpcCallMetrics.Should().ContainSingle().Subject;
 
             metric.Succeeded.Should().BeFalse();
-            metric.Exception?.GetType().Should().Be(typeof(TaskCanceledException));
+            metric.Exception.Should().BeEquivalentTo(exception);
             metric.HasException.Should().BeTrue();
             metric.WasCancelled.Should().BeTrue();
 
@@ -301,8 +301,8 @@ private static async Task ExecuteWithRetries(
             await sut.ExecuteWithRetries(
                 new RpcCall(RpcService, RpcCallName),
                 action,
+                null,
                 Substitute.For<ILog>(),
-                false,
                 clientOperationMetricsBuilder,
                 cancellationToken);
         }
@@ -320,7 +320,6 @@ private static async Task<Guid> ExecuteResult(
                 new RpcCall(RpcService, RpcCallName),
                 action,
                 Substitute.For<ILog>(),
-                abandonActionOnCancellation: false,
                 clientOperationMetricsBuilder,
                 cancellationToken);
         }
@@ -342,7 +341,6 @@ await sut.ExecuteWithNoRetries(
                     return true;
                 },
                 Substitute.For<ILog>(),
-                abandonActionOnCancellation: false,
                 clientOperationMetricsBuilder,
                 cancellationToken);
         }