Modify MNTR to work with the new MNTR package (#5288)

* Remove fact command line argument dependency * Fix CommandLine, should not depend on Environment.GetCommandLineArgs * Fix old MNTR to run with the new fact attribute and CommandLine
akkadotnet · Sep 28, 2021 · eb955c2 · eb955c2
1 parent 084156e
commit eb955c2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/src/core/Akka.MultiNodeTestRunner.Shared.Tests/MultiNodeTestRunnerDiscovery/DiscoverySpec.cs b/src/core/Akka.MultiNodeTestRunner.Shared.Tests/MultiNodeTestRunnerDiscovery/DiscoverySpec.cs
@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Akka.Remote.TestKit;
 using Akka.TestKit;
 using Xunit;
 using FluentAssertions;
@@ -62,6 +63,7 @@ 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))	
             {
                 using (var discovery = new Discovery())

diff --git a/src/core/Akka.MultiNodeTestRunner/Program.cs b/src/core/Akka.MultiNodeTestRunner/Program.cs
@@ -135,8 +135,8 @@ class Program
         /// </summary>
         static void Main(string[] args)
         {
-            // Force load the args
-            CommandLine.GetPropertyOrDefault("force load", null);
+            CommandLine.Initialize(args);
+
             if (CommandLine.ShowHelp)
             {
                 PrintHelp();
@@ -242,6 +242,7 @@ static void Main(string[] args)
             }
 #endif
 
+            Environment.SetEnvironmentVariable(MultiNodeFactAttribute.MultiNodeTestEnvironmentName, "1");
             using (var controller = new XunitFrontController(AppDomainSupport.IfAvailable, assemblyPath))
             {
                 using (var discovery = new Discovery())

diff --git a/src/core/Akka.NodeTestRunner/Program.cs b/src/core/Akka.NodeTestRunner/Program.cs
@@ -36,6 +36,8 @@ class Program
 
         static int Main(string[] args)
         {
+            CommandLine.Initialize(args);
+
             var nodeIndex = CommandLine.GetInt32("multinode.index");
             var nodeRole = CommandLine.GetProperty("multinode.role");
             var assemblyFileName = CommandLine.GetProperty("multinode.test-assembly");
@@ -64,6 +66,7 @@ static int Main(string[] args)
 #endif
 
             Thread.Sleep(TimeSpan.FromSeconds(10));
+            Environment.SetEnvironmentVariable(MultiNodeFactAttribute.MultiNodeTestEnvironmentName, "1");
             using (var controller = new XunitFrontController(AppDomainSupport.IfAvailable, assemblyFileName))
             {
                 /* need to pass in just the assembly name to Discovery, not the full path

diff --git a/src/core/Akka.Remote.TestKit/CommandLine.cs b/src/core/Akka.Remote.TestKit/CommandLine.cs
@@ -26,17 +26,19 @@ namespace Akka.Remote.TestKit
     ///     var testName = CommandLine.GetProperty("multinode.test-method");
     /// </code>
     /// </summary>
-    public class CommandLine
+    public static class CommandLine
     {
-        private static readonly StringDictionary Values;
+        private static readonly StringDictionary Values = new StringDictionary();
 
         static CommandLine()
         {
-            Values = new StringDictionary();
+            Initialize(Environment.GetCommandLineArgs());
+        }
 
+        public static void Initialize(string[] args)
+        {
             // Detect and fix PowerShell command line input.
             // PowerShell splits command line arguments on '.'
-            var args = Environment.GetCommandLineArgs();
             var fixedArgs = new List<string>();
             for (var i = 1; i < args.Length - 1; ++i)
             {
@@ -71,7 +73,7 @@ static CommandLine()
 
                 if (tokens.Length == 2)
                 {
-                    Values.Add(tokens[0], tokens[1]);
+                    Values[tokens[0]] = tokens[1].Trim().Trim('"');
                 }
                 else
                 {

diff --git a/src/core/Akka.Remote.TestKit/MultiNodeFact.cs b/src/core/Akka.Remote.TestKit/MultiNodeFact.cs
@@ -16,23 +16,17 @@ public class MultiNodeFactAttribute : FactAttribute
         /// Set by MultiNodeTestRunner when running multi-node tests
         /// </summary>
         public const string MultiNodeTestEnvironmentName = "__AKKA_MULTI_NODE_ENVIRONMENT";
-
-        public static Lazy<bool> ExecutedByMultiNodeRunner =
-            new Lazy<bool>(() =>
-            {
-                var args = Environment.GetCommandLineArgs();
-                if (args.Length == 0) return false;
-                var firstArg = args[0];
-                return firstArg.Contains("Akka.MultiNodeTestRunner") 
-                    || firstArg.Contains("Akka.NodeTestRunner")
-                    || Environment.GetEnvironmentVariable(MultiNodeTestEnvironmentName) != null;
-            });
+
+        private bool? _executedByMultiNodeRunner;
 
         public override string Skip
         {
             get
             {
-                return ExecutedByMultiNodeRunner.Value
+                if (_executedByMultiNodeRunner == null)
+                    _executedByMultiNodeRunner =
+                        Environment.GetEnvironmentVariable(MultiNodeTestEnvironmentName) != null;
+                return _executedByMultiNodeRunner != null && _executedByMultiNodeRunner.Value
                     ? base.Skip
                     : "Must be executed by multi-node test runner";
             }