Fix race condition in test

microsoft · Jun 16, 2020 · 1190895 · 1190895
1 parent 74f971f
commit 1190895
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeClientTests.cs b/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeClientTests.cs
@@ -460,8 +460,16 @@ public void DesignModeClientConnectShouldCallRequestManagerForFinalizationStart(
             this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
             this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startFinalization);
 
+            this.mockTestRequestManager
+                .Setup(
+                    rm => rm.FinalizeMultiTestRun(
+                        It.IsAny<MultiTestRunFinalizationPayload>(),
+                        It.IsAny<IMultiTestRunFinalizationEventsHandler>()))
+                .Callback(() => complateEvent.Set());
+
             this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
 
+            Assert.IsTrue(this.complateEvent.WaitOne(Timeout), "Finalization not completed.");
             this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Never);
             this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.MultiTestRunFinalizationComplete, It.IsAny<MultiTestRunFinalizationCompletePayload>()), Times.Never);
             this.mockTestRequestManager.Verify(rm => rm.FinalizeMultiTestRun(It.IsAny<MultiTestRunFinalizationPayload>(), It.IsAny<MultiTestRunFinalizationEventsHandler>()));