migrate basic-ops in-proc tests to use new factory;

Author: mgravell

tests/StackExchange.Redis.Tests/BasicOpTests.cs

@@ -25,25 +25,26 @@ public abstract class BasicOpsTestsBase(ITestOutputHelper output, SharedConnecti
     [Fact]
     public async Task PingOnce()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
 
         var duration = await db.PingAsync().ForAwait();
         Log("Ping took: " + duration);
         Assert.True(duration.TotalMilliseconds > 0);
     }
 
-    [Fact(Skip = "This needs some CI love, it's not a scenario we care about too much but noisy atm.")]
+    [Fact]
     public async Task RapidDispose()
     {
-        await using var primary = Create();
+        SkipIfWouldUseRealServer("This needs some CI love, it's not a scenario we care about too much but noisy atm.");
+        await using var primary = ConnectFactory();
         var db = primary.GetDatabase();
         RedisKey key = Me();
         db.KeyDelete(key, CommandFlags.FireAndForget);
 
         for (int i = 0; i < 10; i++)
         {
-            await using var secondary = Create(fail: true, shared: false);
+            await using var secondary = primary.CreateClient();
             secondary.GetDatabase().StringIncrement(key, flags: CommandFlags.FireAndForget);
         }
         // Give it a moment to get through the pipe...they were fire and forget
@@ -54,7 +55,7 @@ public async Task RapidDispose()
     [Fact]
     public async Task PingMany()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         var tasks = new Task<TimeSpan>[100];
         for (int i = 0; i < tasks.Length; i++)
@@ -69,7 +70,7 @@ public async Task PingMany()
     [Fact]
     public async Task GetWithNullKey()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         const string? key = null;
         var ex = Assert.Throws<ArgumentException>(() => db.StringGet(key));
@@ -79,7 +80,7 @@ public async Task GetWithNullKey()
     [Fact]
     public async Task SetWithNullKey()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         const string? key = null, value = "abc";
         var ex = Assert.Throws<ArgumentException>(() => db.StringSet(key!, value));
@@ -89,7 +90,7 @@ public async Task SetWithNullKey()
     [Fact]
     public async Task SetWithNullValue()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         string key = Me();
         const string? value = null;
@@ -107,7 +108,7 @@ public async Task SetWithNullValue()
     [Fact]
     public async Task SetWithDefaultValue()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         string key = Me();
         var value = default(RedisValue); // this is kinda 0... ish
@@ -125,7 +126,7 @@ public async Task SetWithDefaultValue()
     [Fact]
     public async Task SetWithZeroValue()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         string key = Me();
         const long value = 0;
@@ -143,7 +144,7 @@ public async Task SetWithZeroValue()
     [Fact]
     public async Task GetSetAsync()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
 
         RedisKey key = Me();
@@ -168,7 +169,7 @@ public async Task GetSetAsync()
     [Fact]
     public async Task GetSetSync()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
 
         RedisKey key = Me();
@@ -195,7 +196,7 @@ public async Task GetSetSync()
     [InlineData(true, false)]
     public async Task GetWithExpiry(bool exists, bool hasExpiry)
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         RedisKey key = Me();
         db.KeyDelete(key, CommandFlags.FireAndForget);
@@ -231,7 +232,7 @@ public async Task GetWithExpiry(bool exists, bool hasExpiry)
     [Fact]
     public async Task GetWithExpiryWrongTypeAsync()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         RedisKey key = Me();
         _ = db.KeyDeleteAsync(key);
@@ -254,7 +255,7 @@ public async Task GetWithExpiryWrongTypeAsync()
     [Fact]
     public async Task GetWithExpiryWrongTypeSync()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         RedisKey key = Me();
         var ex = await Assert.ThrowsAsync<RedisServerException>(async () =>
@@ -270,12 +271,12 @@ public async Task GetWithExpiryWrongTypeSync()
     [Fact]
     public async Task TestSevered()
     {
-        await using var conn = Create(allowAdmin: true, shared: false);
+        await using var conn = ConnectFactory(allowAdmin: true, shared: false);
         var db = conn.GetDatabase();
         string key = Me();
         db.KeyDelete(key, CommandFlags.FireAndForget);
         db.StringSet(key, key, flags: CommandFlags.FireAndForget);
-        var server = GetServer(conn);
+        var server = GetServer(conn.DefaultClient);
         Assert.SkipUnless(server.CanSimulateConnectionFailure(), "Skipping because server cannot simulate connection failure");
 
         SetExpectedAmbientFailureCount(2);
@@ -293,7 +294,7 @@ public async Task TestSevered()
     [Fact]
     public async Task IncrAsync()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         RedisKey key = Me();
         db.KeyDelete(key, CommandFlags.FireAndForget);
@@ -321,7 +322,7 @@ public async Task IncrAsync()
     [Fact]
     public async Task IncrSync()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         RedisKey key = Me();
         Log(key);
@@ -350,7 +351,7 @@ public async Task IncrSync()
     [Fact]
     public async Task IncrDifferentSizes()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         RedisKey key = Me();
         db.KeyDelete(key, CommandFlags.FireAndForget);
@@ -380,30 +381,10 @@ private static void Incr(IDatabase database, RedisKey key, int delta, ref int to
         total += delta;
     }
 
-    [Fact]
-    public async Task ShouldUseSharedMuxer()
-    {
-        Log($"Shared: {SharedFixtureAvailable}");
-        if (SharedFixtureAvailable)
-        {
-            await using var a = Create();
-            Assert.IsNotType<ConnectionMultiplexer>(a);
-            await using var b = Create();
-            Assert.Same(a, b);
-        }
-        else
-        {
-            await using var a = Create();
-            Assert.IsType<ConnectionMultiplexer>(a);
-            await using var b = Create();
-            Assert.NotSame(a, b);
-        }
-    }
-
     [Fact]
     public async Task Delete()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         var key = Me();
         _ = db.StringSetAsync(key, "Heyyyyy");
@@ -418,7 +399,7 @@ public async Task Delete()
     [Fact]
     public async Task DeleteAsync()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         var key = Me();
         _ = db.StringSetAsync(key, "Heyyyyy");
@@ -433,7 +414,7 @@ public async Task DeleteAsync()
     [Fact]
     public async Task DeleteMany()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         var key1 = Me();
         var key2 = Me() + "2";
@@ -452,7 +433,7 @@ public async Task DeleteMany()
     [Fact]
     public async Task DeleteManyAsync()
     {
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase();
         var key1 = Me();
         var key2 = Me() + "2";
@@ -472,7 +453,7 @@ public async Task DeleteManyAsync()
     public async Task WrappedDatabasePrefixIntegration()
     {
         var key = Me();
-        await using var conn = Create();
+        await using var conn = ConnectFactory();
         var db = conn.GetDatabase().WithKeyPrefix("abc");
         db.KeyDelete(key, CommandFlags.FireAndForget);
         db.StringIncrement(key, flags: CommandFlags.FireAndForget);
@@ -486,8 +467,8 @@ public async Task WrappedDatabasePrefixIntegration()
     [Fact]
     public async Task TransactionSync()
     {
-        await using var conn = Create();
-        Assert.SkipUnless(conn.RawConfig.CommandMap.IsAvailable(RedisCommand.MULTI), "MULTI is not available");
+        await using var conn = ConnectFactory();
+        Assert.SkipUnless(conn.DefaultClient.RawConfig.CommandMap.IsAvailable(RedisCommand.MULTI), "MULTI is not available");
         var db = conn.GetDatabase();
 
         RedisKey key = Me();
@@ -506,8 +487,8 @@ public async Task TransactionSync()
     [Fact]
     public async Task TransactionAsync()
     {
-        await using var conn = Create();
-        Assert.SkipUnless(conn.RawConfig.CommandMap.IsAvailable(RedisCommand.MULTI), "MULTI is not available");
+        await using var conn = ConnectFactory();
+        Assert.SkipUnless(conn.DefaultClient.RawConfig.CommandMap.IsAvailable(RedisCommand.MULTI), "MULTI is not available");
 
         var db = conn.GetDatabase();
 

tests/StackExchange.Redis.Tests/ExceptionFactoryTests.cs

@@ -4,7 +4,7 @@
 
 namespace StackExchange.Redis.Tests;
 
-public class ExceptionFactoryTests(ITestOutputHelper output) : TestBase(output)
+public class ExceptionFactoryTests(ITestOutputHelper output, InProcServerFixture fixture) : TestBase(output, fixture)
 {
     [Fact]
     public async Task NullLastException()

tests/StackExchange.Redis.Tests/InProcessTestServer.cs

@@ -6,7 +6,6 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Pipelines.Sockets.Unofficial;
 using StackExchange.Redis.Configuration;
 using StackExchange.Redis.Server;
 using Xunit;
@@ -25,7 +24,7 @@ public InProcessTestServer(ITestOutputHelper? log = null)
         Tunnel = new InProcTunnel(this);
     }
 
-    public Task<ConnectionMultiplexer> ConnectAsync(bool withPubSub = false, WriteMode writeMode = WriteMode.Default, TextWriter? log = null)
+    public Task<ConnectionMultiplexer> ConnectAsync(bool withPubSub = true, WriteMode writeMode = WriteMode.Default, TextWriter? log = null)
         => ConnectionMultiplexer.ConnectAsync(GetClientConfig(withPubSub, writeMode), log);
 
     // view request/response highlights in the log
@@ -47,7 +46,7 @@ public override TypedRedisValue Execute(RedisClient client, in RedisRequest requ
         return result;
     }
 
-    public ConfigurationOptions GetClientConfig(bool withPubSub = false, WriteMode writeMode = WriteMode.Default)
+    public ConfigurationOptions GetClientConfig(bool withPubSub = true, WriteMode writeMode = WriteMode.Default)
     {
         var commands = GetCommands();
         if (!withPubSub)

tests/StackExchange.Redis.Tests/MovedUnitTests.cs

@@ -27,7 +27,7 @@ public async Task CrossSlotDisallowed(ServerType serverType, WriteMode writeMode
         string keyA = "abc", keyB = "def"; // known to be on different slots
 
         using var server = new InProcessTestServer(log) { ServerType = serverType };
-        await using var muxer = await server.ConnectAsync(writeMode: writeMode);
+        await using var muxer = await server.ConnectAsync(writeMode: writeMode, withPubSub: false);
 
         var db = muxer.GetDatabase();
         await db.StringSetAsync(keyA, "value", flags: CommandFlags.FireAndForget);
@@ -109,7 +109,7 @@ public async Task MovedToSameEndpoint_TriggersReconnectAndRetry_CommandSucceeds(
             log: log) { ServerType = serverType, };
 
         // Act: Connect to the test server
-        await using var conn = await testServer.ConnectAsync();
+        await using var conn = await testServer.ConnectAsync(withPubSub: false);
         // Ping the server to ensure it's responsive
         var server = conn.GetServer(testServer.DefaultEndPoint);
 

tests/StackExchange.Redis.Tests/PubSubTests.cs

@@ -21,7 +21,6 @@ public class InProcPubSubTests(ITestOutputHelper output, InProcServerFixture fix
     : PubSubTestBase(output, null, fixture)
 {
     protected override bool UseDedicatedInProcessServer => true;
-    protected override bool UseInProcessServerPubSub => true;
 }
 
 [RunPerProtocol]

tests/StackExchange.Redis.Tests/TestBase.cs

@@ -586,7 +586,7 @@ protected static async Task UntilConditionAsync(TimeSpan maxWaitTime, Func<bool>
 
     // simplified usage to get an interchangeable dedicated vs shared in-process server, useful for debugging
     protected virtual bool UseDedicatedInProcessServer => false; // use the shared server by default
-    protected virtual bool UseInProcessServerPubSub => false;
+
     internal ClientFactory ConnectFactory(bool allowAdmin = false, string? channelPrefix = null, bool shared = true)
     {
         if (UseDedicatedInProcessServer)
@@ -597,9 +597,14 @@ internal ClientFactory ConnectFactory(bool allowAdmin = false, string? channelPr
         return new ClientFactory(this, allowAdmin, channelPrefix, shared, null);
     }
 
-    protected void SkipIfWouldUseInProcessServer()
+    protected void SkipIfWouldUseInProcessServer(string? reason = null)
+    {
+        Assert.SkipWhen(_inProcServerFixture != null || UseDedicatedInProcessServer, reason ?? "In-process server is in use.");
+    }
+
+    protected void SkipIfWouldUseRealServer(string? reason = null)
     {
-        Assert.SkipWhen(_inProcServerFixture != null || UseDedicatedInProcessServer, "In-process server is in use.");
+        Assert.SkipUnless(_inProcServerFixture != null || UseDedicatedInProcessServer, reason ?? "Real server is in use.");
     }
 
     internal sealed class ClientFactory : IDisposable, IAsyncDisposable
@@ -628,7 +633,7 @@ public IInternalConnectionMultiplexer CreateClient()
         {
             if (_server is not null)
             {
-                var config = _server.GetClientConfig(withPubSub: _testBase.UseInProcessServerPubSub);
+                var config = _server.GetClientConfig();
                 config.AllowAdmin = _allowAdmin;
                 config.Protocol = TestContext.Current.GetProtocol();
                 if (_channelPrefix is not null)