Merge pull request #292 from AbhitejJohn/fixdiscoveryhang

xunit · Feb 8, 2022 · 65cf2b7 · 65cf2b7
2 parents 277a7a4 + a1b50c5
commit 65cf2b7
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/xunit.runner.visualstudio/Sinks/VsDiscoverySink.cs b/src/xunit.runner.visualstudio/Sinks/VsDiscoverySink.cs
@@ -189,9 +189,16 @@ void HandleTestCaseDiscoveryMessage(MessageHandlerArgs<ITestCaseDiscoveryMessage
 
         void HandleDiscoveryCompleteMessage(MessageHandlerArgs<IDiscoveryCompleteMessage> args)
         {
-            SendExistingTestCases();
-
-            Finished.Set();
+            try
+            {
+                SendExistingTestCases();
+            }
+            finally
+            {
+                // Set test discovery complete despite any potential issues 
+                // with sending test cases over. This would avoid causing test discovery to hang for the entire session.
+                Finished.Set();
+            }
 
             HandleCancellation(args);
         }