some clean up and test execution optimization

Author: atakavci

tests/NRedisStack.Tests/RedisFixture.cs

@@ -52,9 +52,12 @@ public class RedisFixture : IDisposable
     public bool isEnterprise = Environment.GetEnvironmentVariable("IS_ENTERPRISE") == "true";
     public bool isOSSCluster;
 
+    private ConnectionMultiplexer redis;
+    private ConfigurationOptions defaultConfig;
+
     public RedisFixture()
     {
-        ConfigurationOptions clusterConfig = new ConfigurationOptions
+        defaultConfig = new ConfigurationOptions
         {
             AsyncTimeout = 10000,
             SyncTimeout = 10000
@@ -93,16 +96,21 @@ public RedisFixture()
                 isOSSCluster = true;
             }
         }
-
-        Redis = GetConnectionById(clusterConfig, defaultEndpointId);
     }
 
     public void Dispose()
     {
         Redis.Close();
     }
 
-    public ConnectionMultiplexer Redis { get; }
+    public ConnectionMultiplexer Redis
+    {
+        get
+        {
+            redis = redis ?? GetConnectionById(defaultConfig, defaultEndpointId);
+            return redis;
+        }
+    }
 
     public ConnectionMultiplexer GetConnectionById(ConfigurationOptions configurationOptions, string id)
     {

tests/NRedisStack.Tests/SkipIfRedisAttribute.cs

@@ -21,6 +21,8 @@ public class SkipIfRedisAttribute : FactAttribute
     private readonly Comparison _comparison;
     private readonly List<Is> _environments = new List<Is>();
 
+    private static Version serverVersion = null;
+
     public SkipIfRedisAttribute(
             Is environment,
             Comparison comparison = Comparison.LessThan,
@@ -95,7 +97,7 @@ public override string? Skip
                 }
                 // Version check (if Is.Standalone/Is.OSSCluster is set then )
 
-                var serverVersion = redisFixture.Redis.GetServer(redisFixture.Redis.GetEndPoints()[0]).Version;
+                serverVersion = serverVersion ?? redisFixture.Redis.GetServer(redisFixture.Redis.GetEndPoints()[0]).Version;
                 var targetVersion = new Version(_targetVersion);
                 int comparisonResult = serverVersion.CompareTo(targetVersion);
 

tests/NRedisStack.Tests/TokenBasedAuthentication/AuthenticationTests.cs

@@ -18,16 +18,12 @@ public AuthenticationTests(RedisFixture redisFixture) : base(redisFixture) { }
         [TargetEnvironment("standalone-entraid-acl")]
         public void TestTokenBasedAuthentication()
         {
-            Assert.True(new FaultInjectorClient().TriggerActionAsync("enable_entraid", new Dictionary<string, object>()).Wait(5000), "Entraid could not be enabled this time!!!");
-            // NOTE: ConnectionMultiplexer instances should be as long-lived as possible. Ideally a single ConnectionMultiplexer per cache is reused over the lifetime of the client application process.
-            ConnectionMultiplexer? connectionMultiplexer = null;
-            // StringWriter connectionLog = new();
 
             var configurationOptions = new ConfigurationOptions().ConfigureForAzureWithTokenCredentialAsync(new DefaultAzureCredential()).Result!;
             configurationOptions.Ssl = false;
             configurationOptions.AbortOnConnectFail = true; // Fail fast for the purposes of this sample. In production code, this should remain false to retry connections on startup
 
-            connectionMultiplexer = redisFixture.GetConnectionById(configurationOptions, "standalone-entraid-acl");
+            ConnectionMultiplexer?connectionMultiplexer = redisFixture.GetConnectionById(configurationOptions, "standalone-entraid-acl");
 
             IDatabase db = connectionMultiplexer.GetDatabase();
 
@@ -53,11 +49,5 @@ public void TestTokenBasedAuthentication()
             Assert.Equal(1, res1.TotalResults);
             Assert.Equal(value, res1.Documents[0][field]);
         }
-
-        [Fact]
-        public void DummyTest()
-        {
-            Assert.True(true);
-        }
     }
 }