acceptance tests green

microsoft · Jun 10, 2020 · 44c5fdc · 44c5fdc
1 parent 29d618d
commit 44c5fdc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/...t.TestPlatform.Client/MultiTestRunsFinalization/MultiTestRunsFinalizationEventsHandler.cs b/...t.TestPlatform.Client/MultiTestRunsFinalization/MultiTestRunsFinalizationEventsHandler.cs
@@ -46,7 +46,7 @@ public void HandleMultiTestRunsFinalizationComplete(ICollection<AttachmentSet> a
 
             var payload = new MultiTestRunsFinalizationCompletePayload()
             {
-                Attachments = null
+                Attachments = attachments
             };
 
             // Send run complete to translation layer

diff --git a/...estPlatform.CrossPlatEngine/MultiTestRunsFinalization/MultiTestRunsFinalizationManager.cs b/...estPlatform.CrossPlatEngine/MultiTestRunsFinalization/MultiTestRunsFinalizationManager.cs
@@ -53,11 +53,7 @@ public async Task FinalizeMultiTestRunsAsync(ICollection<AttachmentSet> attachme
 
                 var completedTask = await Task.WhenAny(task, taskCompletionSource.Task);
 
-                if (completedTask == task)
-                {
-                    eventHandler.HandleMultiTestRunsFinalizationComplete(attachments);
-                }
-                else
+                if (completedTask != task)
                 {
                     eventHandler.HandleMultiTestRunsFinalizationComplete(null);
                 }

diff --git a/src/Microsoft.TestPlatform.Utilities/CodeCoverageDataAttachmentsHandler.cs b/src/Microsoft.TestPlatform.Utilities/CodeCoverageDataAttachmentsHandler.cs
@@ -89,14 +89,18 @@ private string MergeCodeCoverageFiles(IList<string> files, CancellationToken can
             }
             catch (OperationCanceledException)
             {
-                if (EqtTrace.IsInfoEnabled)
+                if (EqtTrace.IsWarningEnabled)
                 {
-                    EqtTrace.Info("CodeCoverageDataCollectorAttachmentsHandler: operation was cancelled.");
+                    EqtTrace.Warning("CodeCoverageDataCollectorAttachmentsHandler: operation was cancelled.");
                 }
                 throw;
             }
             catch (ObjectDisposedException)
             {
+                if (EqtTrace.IsWarningEnabled)
+                {
+                    EqtTrace.Warning("CodeCoverageDataCollectorAttachmentsHandler: object disposed.");
+                }
                 throw;
             }
             catch (Exception ex)

diff --git a/...icrosoft.TestPlatform.AcceptanceTests/TranslationLayerTests/FinalizeMultiTestRunsTests.cs b/...icrosoft.TestPlatform.AcceptanceTests/TranslationLayerTests/FinalizeMultiTestRunsTests.cs
@@ -56,6 +56,7 @@ public void FinalizeMultiTestRuns(RunnerInfo runnerInfo)
             this.vstestConsoleWrapper.FinalizeMultiTestRuns(runEventHandler.Attachments, multiTestRunsFinalizationEventHandler);
 
             // Assert
+            multiTestRunsFinalizationEventHandler.EnsureSuccess();
             Assert.AreEqual(testEnvironment.RunnerFramework.Equals(IntegrationTestBase.DesktopRunnerFramework) ? 1 : 2, this.multiTestRunsFinalizationEventHandler.Attachments.Count);
         }