test fixture for in-proc; run with basic tests

Author: mgravell

tests/StackExchange.Redis.Tests/BasicOpTests.cs

@@ -7,7 +7,20 @@
 namespace StackExchange.Redis.Tests;
 
 [RunPerProtocol]
-public class BasicOpsTests(ITestOutputHelper output, SharedConnectionFixture fixture) : TestBase(output, fixture)
+public class BasicOpsTests(ITestOutputHelper output, SharedConnectionFixture fixture)
+    : BasicOpsTestsBase(output, fixture, null)
+{
+}
+
+[RunPerProtocol]
+public class InProcBasicOpsTests(ITestOutputHelper output, InProcServerFixture fixture)
+    : BasicOpsTestsBase(output, null, fixture)
+{
+}
+
+[RunPerProtocol]
+public abstract class BasicOpsTestsBase(ITestOutputHelper output, SharedConnectionFixture? connection, InProcServerFixture? server)
+    : TestBase(output, connection, server)
 {
     [Fact]
     public async Task PingOnce()
@@ -472,6 +485,7 @@ public async Task WrappedDatabasePrefixIntegration()
     public async Task TransactionSync()
     {
         await using var conn = Create();
+        Assert.SkipUnless(conn.RawConfig.CommandMap.IsAvailable(RedisCommand.MULTI), "MULTI is not available");
         var db = conn.GetDatabase();
 
         RedisKey key = Me();
@@ -491,6 +505,8 @@ public async Task TransactionSync()
     public async Task TransactionAsync()
     {
         await using var conn = Create();
+        Assert.SkipUnless(conn.RawConfig.CommandMap.IsAvailable(RedisCommand.MULTI), "MULTI is not available");
+
         var db = conn.GetDatabase();
 
         RedisKey key = Me();

tests/StackExchange.Redis.Tests/Helpers/InProcServerFixture.cs

@@ -0,0 +1,27 @@
+using System;
+using StackExchange.Redis.Configuration;
+using Xunit;
+
+[assembly: AssemblyFixture(typeof(StackExchange.Redis.Tests.InProcServerFixture))]
+
+// ReSharper disable once CheckNamespace
+namespace StackExchange.Redis.Tests;
+
+public class InProcServerFixture : IDisposable
+{
+    private readonly InProcessTestServer _server = new();
+    private readonly ConfigurationOptions _config;
+    public InProcServerFixture()
+    {
+        _config = _server.GetClientConfig();
+        Configuration = _config.ToString();
+    }
+
+    public ConfigurationOptions Config => _config;
+
+    public string Configuration { get; }
+
+    public Tunnel? Tunnel => _server.Tunnel;
+
+    public void Dispose() => _server.Dispose();
+}

tests/StackExchange.Redis.Tests/HighIntegrityBasicOpsTests.cs

@@ -6,3 +6,8 @@ public class HighIntegrityBasicOpsTests(ITestOutputHelper output, SharedConnecti
 {
     internal override bool HighIntegrity => true;
 }
+
+public class InProcHighIntegrityBasicOpsTests(ITestOutputHelper output, InProcServerFixture fixture) : InProcBasicOpsTests(output, fixture)
+{
+    internal override bool HighIntegrity => true;
+}

tests/StackExchange.Redis.Tests/TestBase.cs

@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using StackExchange.Redis.Configuration;
 using StackExchange.Redis.Profiling;
 using StackExchange.Redis.Tests.Helpers;
 using Xunit;
@@ -17,22 +18,35 @@ public abstract class TestBase : IDisposable
 {
     private ITestOutputHelper Output { get; }
     protected TextWriterOutputHelper Writer { get; }
-    protected virtual string GetConfiguration() => GetDefaultConfiguration();
+    protected virtual string GetConfiguration()
+    {
+        if (_inProcServerFixture != null)
+        {
+            return _inProcServerFixture.Configuration;
+        }
+        return GetDefaultConfiguration();
+    }
     internal static string GetDefaultConfiguration() => TestConfig.Current.PrimaryServerAndPort;
 
-    private readonly SharedConnectionFixture? _fixture;
+    private readonly SharedConnectionFixture? _sharedConnectionFixture;
+    private readonly InProcServerFixture? _inProcServerFixture;
 
-    protected bool SharedFixtureAvailable => _fixture != null && _fixture.IsEnabled && !HighIntegrity;
+    protected bool SharedFixtureAvailable => _sharedConnectionFixture != null && _sharedConnectionFixture.IsEnabled && !HighIntegrity;
 
-    protected TestBase(ITestOutputHelper output, SharedConnectionFixture? fixture = null)
+    protected TestBase(ITestOutputHelper output, SharedConnectionFixture? connection = null, InProcServerFixture? server = null)
     {
         Output = output;
         Output.WriteFrameworkVersion();
         Writer = new TextWriterOutputHelper(output);
-        _fixture = fixture;
+        _sharedConnectionFixture = connection;
+        _inProcServerFixture = server;
         ClearAmbientFailures();
     }
 
+    protected TestBase(ITestOutputHelper output, InProcServerFixture fixture) : this(output, null, fixture)
+    {
+    }
+
     /// <summary>
     /// Useful to temporarily get extra worker threads for an otherwise synchronous test case which will 'block' the thread,
     /// on a synchronous API like <see cref="Task.Wait"/> or <see cref="Task.Result"/>.
@@ -85,7 +99,7 @@ protected static void CollectGarbage()
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Justification = "Trust me yo")]
     public void Dispose()
     {
-        _fixture?.Teardown(Writer);
+        _sharedConnectionFixture?.Teardown(Writer);
         Teardown();
         Writer.Dispose();
         GC.SuppressFinalize(this);
@@ -226,6 +240,8 @@ protected static IServer GetAnyPrimary(IConnectionMultiplexer muxer)
 
     internal virtual bool HighIntegrity => false;
 
+    internal virtual Tunnel? Tunnel => _inProcServerFixture?.Tunnel;
+
     internal virtual IInternalConnectionMultiplexer Create(
         string? clientName = null,
         int? syncTimeout = null,
@@ -262,17 +278,18 @@ internal virtual IInternalConnectionMultiplexer Create(
 
         // Share a connection if instructed to and we can - many specifics mean no sharing
         bool highIntegrity = HighIntegrity;
-        if (shared && expectedFailCount == 0
-            && _fixture != null && _fixture.IsEnabled
+        var tunnel = Tunnel;
+        if (tunnel is null && shared && expectedFailCount == 0
+            && _sharedConnectionFixture != null && _sharedConnectionFixture.IsEnabled
             && GetConfiguration() == GetDefaultConfiguration()
             && CanShare(allowAdmin, password, tieBreaker, fail, disabledCommands, enabledCommands, channelPrefix, proxy, configuration, defaultDatabase, backlogPolicy, highIntegrity))
         {
             configuration = GetConfiguration();
-            var fixtureConn = _fixture.GetConnection(this, protocol.Value, caller: caller);
+            var fixtureConn = _sharedConnectionFixture.GetConnection(this, protocol.Value, caller: caller);
             // Only return if we match
             TestBase.ThrowIfIncorrectProtocol(fixtureConn, protocol);
 
-            if (configuration == _fixture.Configuration)
+            if (configuration == _sharedConnectionFixture.Configuration)
             {
                 TestBase.ThrowIfBelowMinVersion(fixtureConn, require);
                 return fixtureConn;
@@ -303,6 +320,7 @@ internal virtual IInternalConnectionMultiplexer Create(
             backlogPolicy,
             protocol,
             highIntegrity,
+            tunnel,
             caller);
 
         TestBase.ThrowIfIncorrectProtocol(conn, protocol);
@@ -392,6 +410,7 @@ public static ConnectionMultiplexer CreateDefault(
         BacklogPolicy? backlogPolicy = null,
         RedisProtocol? protocol = null,
         bool highIntegrity = false,
+        Tunnel? tunnel = null,
         [CallerMemberName] string caller = "")
     {
         StringWriter? localLog = null;
@@ -413,6 +432,7 @@ public static ConnectionMultiplexer CreateDefault(
                 syncTimeout = int.MaxValue;
             }
 
+            config.Tunnel = tunnel;
             if (channelPrefix is not null) config.ChannelPrefix = RedisChannel.Literal(channelPrefix);
             if (tieBreaker is not null) config.TieBreaker = tieBreaker;
             if (password is not null) config.Password = string.IsNullOrEmpty(password) ? null : password;

toys/StackExchange.Redis.Server/RedisServer.cs

@@ -318,6 +318,22 @@ protected virtual bool Rename(int database, in RedisKey oldKey, in RedisKey newK
             return true;
         }
 
+        [RedisCommand(4)]
+        protected virtual TypedRedisValue SetEx(RedisClient client, in RedisRequest request)
+        {
+            RedisKey key = request.GetKey(1);
+            int seconds = request.GetInt32(2);
+            var value = request.GetValue(3);
+            SetEx(client.Database, key, seconds, value);
+            return TypedRedisValue.OK;
+        }
+
+        protected virtual void SetEx(int database, in RedisKey key, int seconds, in RedisValue value)
+        {
+            Set(database, key, value);
+            Expire(database, key, TimeSpan.FromSeconds(seconds));
+        }
+
         [RedisCommand(3, "client", "setname", LockFree = true)]
         protected virtual TypedRedisValue ClientSetname(RedisClient client, in RedisRequest request)
         {