Avoiding System.Threading.Tasks.TaskCanceledException : A task was ca…

…nceled.
Particular · Feb 23, 2016 · 4afc98d · 4afc98d
1 parent bcf4443
commit 4afc98d
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/ServiceControl.AcceptanceTesting/Support/EndpointRunner.cs b/src/ServiceControl.AcceptanceTesting/Support/EndpointRunner.cs
@@ -84,15 +84,21 @@ public Result Initialize(RunDescriptor run, EndpointBehavior endpointBehavior,
                             }
 
                             //we spin around each 5s since the callback mechanism seems to be shaky
-                            await contextChanged.WaitAsync(TimeSpan.FromSeconds(5), stopToken);
-
-                            if (stopToken.IsCancellationRequested)
+                            try
+                            {
+                                await contextChanged.WaitAsync(TimeSpan.FromSeconds(5), stopToken);
+                            }
+                            catch (OperationCanceledException)
                             {
-                                break;
                             }
 
                             foreach (var when in behavior.Whens)
                             {
+                                if (stopToken.IsCancellationRequested)
+                                {
+                                    return;
+                                }
+
                                 if (executedWhens.Contains(when.Id))
                                 {
                                     continue;
@@ -104,7 +110,7 @@ public Result Initialize(RunDescriptor run, EndpointBehavior endpointBehavior,
                                 }
                             }
                         }
-                    }, stopToken).Unwrap();
+                    }).Unwrap();
                 }
                 return Result.Success();
             }