Fix deadlock and spin wait thread starvation in integration tests

Fixes dotnet#17680 Fixes dotnet#21154 Improves dotnet#17393
sharwell · Mar 1, 2018 · ad9c632 · ad9c632
1 parent dbdbc12
commit ad9c632
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/AbstractEditorTest.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/AbstractEditorTest.cs
@@ -56,6 +56,7 @@ protected void SetUpEditor(string markupCode)
             {
                 VisualStudio.Editor.SetText(code);
                 VisualStudio.Editor.MoveCaret(caretPosition);
+                VisualStudio.Editor.Activate();
             }
             finally
             {

diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpChangeSignatureDialog.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpChangeSignatureDialog.cs
@@ -79,8 +79,7 @@ public void Method(string b, int a) { }
 }", actuaText);
         }
 
-        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/17680"),
-         Trait(Traits.Feature, Traits.Features.ChangeSignature)]
+        [Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
         public void VerifyRemoveParameter()
         {
             SetUpEditor(@"
@@ -114,7 +113,7 @@ class C
     /// A method.
     /// </summary>
     /// <param name=""a""></param>
-    ///
+    /// 
     public void Method(int a) { }
 
     void Test()
@@ -124,8 +123,7 @@ void Test()
 }", actuaText);
         }
 
-        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/17680"),
-         Trait(Traits.Feature, Traits.Features.ChangeSignature)]
+        [Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
         public void VerifyCrossLanguageGlobalUndo()
         {
             SetUpEditor(@"using VBProject;

diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpGenerateTypeDialog.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpGenerateTypeDialog.cs
@@ -21,7 +21,7 @@ public CSharpGenerateTypeDialog(VisualStudioInstanceFactory instanceFactory)
         {
         }
 
-        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/21154"), Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
         public void OpenAndCloseDialog()
         {
             SetUpEditor(@"class C
@@ -42,7 +42,7 @@ void Method()
             GenerateTypeDialog.VerifyClosed();
         }
 
-        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/21154"), Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
         public void CSharpToBasic()
         {
             var vbProj = new ProjectUtils.Project("VBProj");

diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicGenerateTypeDialog.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicGenerateTypeDialog.cs
@@ -21,7 +21,7 @@ public BasicGenerateTypeDialog(VisualStudioInstanceFactory instanceFactory)
         {
         }
 
-        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/21154"), Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
         public void BasicToCSharp()
         {
             var csProj = new ProjectUtils.Project("CSProj");
@@ -68,7 +68,7 @@ public struct A
 }", actualText);
         }
 
-        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/21154"), Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
         public void SameProject()
         {
             SetUpEditor(@"
@@ -107,8 +107,7 @@ End Class
 ", actualText);
         }
 
-        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/17680"),
-         Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)]
         public void CheckFoldersPopulateComboBox()
         {
             var project = new ProjectUtils.Project(ProjectName);

diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/InteractiveWindow_InProc.cs b/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/InteractiveWindow_InProc.cs
@@ -4,6 +4,7 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Microsoft.VisualStudio.IntegrationTest.Utilities.InProcess
@@ -214,7 +215,7 @@ private void WaitForPredicate(Func<bool> predicate)
             var beginTime = DateTime.UtcNow;
             while (!predicate() && DateTime.UtcNow < beginTime.AddMilliseconds(_timeoutInMilliseconds))
             {
-                Task.Delay(50);
+                Thread.Sleep(50);
             }
 
             if (!predicate())

diff --git a/...ualStudio/IntegrationTest/TestUtilities/OutOfProcess/TextViewWindow_OutOfProc.Verifier.cs b/...ualStudio/IntegrationTest/TestUtilities/OutOfProcess/TextViewWindow_OutOfProc.Verifier.cs
@@ -43,6 +43,9 @@ public void CodeActions(
                 FixAllScope? fixAllScope = null,
                 bool blockUntilComplete = true)
             {
+                // Wait for the light bulb to appear before forcing it to drop down, otherwise the UI thread can
+                // deadlock in SuggestedActionsSource.
+                _textViewWindow.WaitForLightBulbSession();
                 _textViewWindow.ShowLightBulb();
                 _textViewWindow.WaitForLightBulbSession();
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ protected void SetUpEditor(string markupCode) @@
                 {
                     VisualStudio.Editor.SetText(code);
                     VisualStudio.Editor.MoveCaret(caretPosition);
+                    VisualStudio.Editor.Activate();
                 }
                 finally
                 {
@@ Expand Down @@