Handling the TaskCanceledException in the results.publish command (mi…

…crosoft#2960) * Handling the TaskCanceledException in the results.publish command * Removed repro code * Removing dummy code added to test Co-authored-by: Shailesh Singh Kushwaha <[email protected]>
hangar18rip · May 5, 2020 · cfe3cfe · cfe3cfe
1 parent 65f92f7
commit cfe3cfe
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/Agent.Worker/TestResults/Legacy/LegacyTestRunDataPublisher.cs b/src/Agent.Worker/TestResults/Legacy/LegacyTestRunDataPublisher.cs
@@ -223,9 +223,10 @@ private async Task<bool> PublishAllTestResultsToSingleTestRunAsync(List<string>
                     StoreTestRunSummaryInEnvVar(testRunSummary);
                 }
             }
-            catch (Exception ex) when (!(ex is OperationCanceledException))
+            catch (Exception ex) when (!(ex is OperationCanceledException && _executionContext.CancellationToken.IsCancellationRequested))
             {
-                //Do not fail the task.
+                // Not catching all the operationcancelled exceptions, as the pipeline cancellation should cancel the command as well.
+                // Do not fail the task.
                 LogPublishTestResultsFailureWarning(ex);
             }
             return isTestRunOutcomeFailed;
@@ -263,7 +264,6 @@ private async Task<bool> PublishToNewTestRunPerTestResultFileAsync(List<string>
 
                 bool changeTestRunTitle = resultFiles.Count > 1;
                 TestRunSummary testRunSummary = new TestRunSummary();
-
                 foreach (var files in groupedFiles)
                 {
                     // Publish separate test run for each result file that has results.
@@ -325,9 +325,10 @@ private async Task<bool> PublishToNewTestRunPerTestResultFileAsync(List<string>
 
                 StoreTestRunSummaryInEnvVar(testRunSummary);
             }
-            catch (Exception ex) when (!(ex is OperationCanceledException))
+            catch (Exception ex) when (!(ex is OperationCanceledException && _executionContext.CancellationToken.IsCancellationRequested))
             {
-                //Do not fail the task.
+                // Not catching all the operationcancelled exceptions, as the pipeline cancellation should cancel the command as well.
+                // Do not fail the task.
                 LogPublishTestResultsFailureWarning(ex);
             }
             return isTestRunOutcomeFailed;