Merge branch 'master' into fixes/2218-clone-on-first-launch

Author: jcansdale

azure-pipelines.yml

@@ -48,15 +48,14 @@ steps:
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
 
-# VSTest is hanging. Skip tests for now; we're still running Appveyor which will handle the tests.
-#- task: VSTest@2
-#  inputs:
-#    searchFolder: '$(Build.SourcesDirectory)\test'
-#    testAssemblyVer2: '**\bin\**\*Tests.dll'
-#    platform: '$(buildPlatform)'
-#    configuration: '$(buildConfiguration)'
-#    diagnosticsEnabled: true
-#    runSettingsFile: '$(Build.SourcesDirectory)\test\test.runsettings'
+- task: VSTest@2
+  inputs:
+    searchFolder: '$(Build.SourcesDirectory)\test'
+    testAssemblyVer2: '**\bin\**\*Tests.dll'
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+    diagnosticsEnabled: true
+    runSettingsFile: '$(Build.SourcesDirectory)\test\test.runsettings'
 
 - task: PublishBuildArtifacts@1
   inputs:

test/GitHub.InlineReviews.UnitTests/GlobalTestAttributes.cs

@@ -0,0 +1,3 @@
+using NUnit.Framework;
+
+[assembly: Timeout(10000)] // Set a 10 second timeout for all tests

test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionManagerTests.cs

@@ -445,6 +445,7 @@ Line 2
             }
 
             [Test, NUnit.Framework.Category("CodeCoverageFlake")]
+            [Ignore("This test sometimes hangs, see https://github.com/github/VisualStudio/issues/2221")]
             public async Task UpdatesInlineCommentThreadsFromEditorContent()
             {
                 var baseContents = @"Line 1
@@ -500,6 +501,7 @@ Line 2
             }
 
             [Test, NUnit.Framework.Category("CodeCoverageFlake")]
+            [Ignore("This test sometimes hangs, see https://github.com/github/VisualStudio/issues/2221")]
             public async Task UpdatesReviewCommentWithNewBody()
             {
                 var baseContents = @"Line 1
@@ -553,6 +555,7 @@ Line 2
             }
 
             [Test]
+            [Ignore("This test sometimes hangs, see https://github.com/github/VisualStudio/issues/2221")]
             public async Task AddsNewReviewCommentToThread()
             {
                 var baseContents = @"Line 1

test/test.runsettings

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
   <RunConfiguration>
-    <TestSessionTimeout>120000</TestSessionTimeout>
+    <TestSessionTimeout>600000</TestSessionTimeout> <!-- 10 minutes -->
   </RunConfiguration>
 </RunSettings>