Merge pull request #895 from nunit/Issue865

Fix for #865
nunit · Nov 2, 2021 · 42a8779 · 42a8779
2 parents 44bef83 + 20918b7
commit 42a8779
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/NUnitTestAdapter/NUnitEngine/NUnitEngineAdapter.cs b/src/NUnitTestAdapter/NUnitEngine/NUnitEngineAdapter.cs
@@ -122,8 +122,15 @@ public void CloseRunner()
             if (Runner.IsTestRunning)
                 Runner.StopRun(true);
 
-            Runner.Unload();
-            Runner.Dispose();
+            try
+            {
+                Runner.Unload();
+                Runner.Dispose();
+            }
+            catch (NUnitEngineUnloadException ex)
+            {
+                logger.Warning($"Engine encountered NUnitEngineUnloadException :  {ex.Message}");
+            }
             Runner = null;
         }
 
@@ -159,7 +166,7 @@ public string GetXmlFilePath(string folder, string defaultFileName, string exten
             int i = 1;
             while (true)
             {
-                string path = Path.Combine(folder,  $"{defaultFileName}.{i++}.{extension}");
+                string path = Path.Combine(folder, $"{defaultFileName}.{i++}.{extension}");
                 if (!File.Exists(path))
                     return path;
             }