From 6c77bd836c938d089fc88e7f63516aa45ad07938 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 14 May 2019 21:56:39 -0500 Subject: [PATCH] Apply hang mitigating timeout in VerifyOpen and VerifyClosed --- .../TestUtilities/OutOfProcess/Dialog_OutOfProc.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/OutOfProcess/Dialog_OutOfProc.cs b/src/VisualStudio/IntegrationTest/TestUtilities/OutOfProcess/Dialog_OutOfProc.cs index 46ad922fdcc..f9878ca685d 100644 --- a/src/VisualStudio/IntegrationTest/TestUtilities/OutOfProcess/Dialog_OutOfProc.cs +++ b/src/VisualStudio/IntegrationTest/TestUtilities/OutOfProcess/Dialog_OutOfProc.cs @@ -14,17 +14,21 @@ public Dialog_OutOfProc(VisualStudioInstance visualStudioInstance) public void VerifyOpen(string dialogName) { + using var cancellationTokenSource = new CancellationTokenSource(Helper.HangMitigatingTimeout); + // FindDialog will wait until the dialog is open, so the return value is unused. - DialogHelpers.FindDialogByName(GetMainWindowHWnd(), dialogName, isOpen: true, CancellationToken.None); + DialogHelpers.FindDialogByName(GetMainWindowHWnd(), dialogName, isOpen: true, cancellationTokenSource.Token); // Wait for application idle to ensure the dialog is fully initialized - VisualStudioInstance.WaitForApplicationIdle(CancellationToken.None); + VisualStudioInstance.WaitForApplicationIdle(cancellationTokenSource.Token); } public void VerifyClosed(string dialogName) { + using var cancellationTokenSource = new CancellationTokenSource(Helper.HangMitigatingTimeout); + // FindDialog will wait until the dialog is closed, so the return value is unused. - DialogHelpers.FindDialogByName(GetMainWindowHWnd(), dialogName, isOpen: false, CancellationToken.None); + DialogHelpers.FindDialogByName(GetMainWindowHWnd(), dialogName, isOpen: false, cancellationTokenSource.Token); } public void Click(string dialogName, string buttonName) -- GitLab