Clean-up MNTR for standalone migration (#5302)

akkadotnet · Oct 11, 2021 · 029d007 · 029d007
1 parent dbe76a2
commit 029d007
Show file tree

Hide file tree

Showing 5 changed files with 261 additions and 233 deletions.
diff --git a/src/core/Akka.MultiNodeTestRunner.Shared.Tests/MultiNodeTestRunnerDiscovery/DiscoverySpec.cs b/src/core/Akka.MultiNodeTestRunner.Shared.Tests/MultiNodeTestRunnerDiscovery/DiscoverySpec.cs
@@ -64,15 +64,22 @@ public void Only_MultiNodeConfig_role_count_used()
         private static Dictionary<string, List<NodeTest>> DiscoverSpecs()
         {
             Environment.SetEnvironmentVariable(MultiNodeFactAttribute.MultiNodeTestEnvironmentName, "1");
-            using (var controller = new XunitFrontController(AppDomainSupport.IfAvailable, new System.Uri(typeof(DiscoveryCases).GetTypeInfo().Assembly.CodeBase).LocalPath))	
+            try
             {
-                using (var discovery = new Discovery())
+                using (var controller = new XunitFrontController(AppDomainSupport.IfAvailable, new System.Uri(typeof(DiscoveryCases).GetTypeInfo().Assembly.CodeBase).LocalPath))	
                 {
-                    controller.Find(false, discovery, TestFrameworkOptions.ForDiscovery());
-                    discovery.Finished.WaitOne();
-                    return discovery.Tests;
+                    using (var discovery = new Discovery())
+                    {
+                        controller.Find(false, discovery, TestFrameworkOptions.ForDiscovery());
+                        discovery.Finished.WaitOne();
+                        return discovery.Tests;
+                    }
                 }
             }
+            finally
+            {
+                Environment.SetEnvironmentVariable(MultiNodeFactAttribute.MultiNodeTestEnvironmentName, null);
+            }
         }
 
         private string KeyFromSpecName(string specName)