Skip to content

Commit 1190895

Browse files
committed
Fix race condition in test
1 parent 74f971f commit 1190895

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeClientTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,16 @@ public void DesignModeClientConnectShouldCallRequestManagerForFinalizationStart(
460460
this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
461461
this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startFinalization);
462462

463+
this.mockTestRequestManager
464+
.Setup(
465+
rm => rm.FinalizeMultiTestRun(
466+
It.IsAny<MultiTestRunFinalizationPayload>(),
467+
It.IsAny<IMultiTestRunFinalizationEventsHandler>()))
468+
.Callback(() => complateEvent.Set());
469+
463470
this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
464471

472+
Assert.IsTrue(this.complateEvent.WaitOne(Timeout), "Finalization not completed.");
465473
this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Never);
466474
this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.MultiTestRunFinalizationComplete, It.IsAny<MultiTestRunFinalizationCompletePayload>()), Times.Never);
467475
this.mockTestRequestManager.Verify(rm => rm.FinalizeMultiTestRun(It.IsAny<MultiTestRunFinalizationPayload>(), It.IsAny<MultiTestRunFinalizationEventsHandler>()));

0 commit comments

Comments
 (0)