Commit 96b16792 authored by Marc Gravell's avatar Marc Gravell

azure SSL tests : fix false positives from 6379 being closed

parent 4c781d7e
...@@ -13,10 +13,9 @@ public class SSL : TestBase ...@@ -13,10 +13,9 @@ public class SSL : TestBase
public SSL(ITestOutputHelper output) : base (output) { } public SSL(ITestOutputHelper output) : base (output) { }
[Theory] [Theory]
[InlineData(null, true)] [InlineData(null, true)] // auto-infer port (but specify 6380)
[InlineData(null, false)] [InlineData(6380, true)] // all explicit
[InlineData(6380, true)] // (note the 6379 port is closed)
[InlineData(6379, false)]
public void ConnectToAzure(int? port, bool ssl) public void ConnectToAzure(int? port, bool ssl)
{ {
Skip.IfNoConfig(nameof(TestConfig.Config.AzureCacheServer), TestConfig.Current.AzureCacheServer); Skip.IfNoConfig(nameof(TestConfig.Config.AzureCacheServer), TestConfig.Current.AzureCacheServer);
...@@ -279,4 +278,4 @@ public void SSLHostInferredFromEndpoints() ...@@ -279,4 +278,4 @@ public void SSLHostInferredFromEndpoints()
Assert.True(options.SslHost == null); Assert.True(options.SslHost == null);
} }
} }
} }
\ No newline at end of file
...@@ -868,7 +868,8 @@ async ValueTask<SocketMode> ISocketCallback.ConnectedAsync(Socket socket, TextWr ...@@ -868,7 +868,8 @@ async ValueTask<SocketMode> ISocketCallback.ConnectedAsync(Socket socket, TextWr
OnDebugAbort(); OnDebugAbort();
// the order is important here: // the order is important here:
// [Socket]<==[NetworkStream]<==[SslStream]<==[ // non-TLS: [Socket]<==[SocketConnection:IDuplexPipe]
// TLS: [Socket]<==[NetworkStream]<==[SslStream]<==[StreamConnection:IDuplexPipe]
var config = Multiplexer.RawConfig; var config = Multiplexer.RawConfig;
IDuplexPipe pipe; IDuplexPipe pipe;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment