Commit 6f746c6f authored by Nick Craver's avatar Nick Craver

Tests: cleanup

parent 8a7fc8f4
...@@ -217,7 +217,6 @@ string StringGet(IServer server, RedisKey key, CommandFlags flags = CommandFlags ...@@ -217,7 +217,6 @@ string StringGet(IServer server, RedisKey key, CommandFlags flags = CommandFlags
var ex = Assert.Throws<RedisServerException>(() => StringGet(conn.GetServer(node.EndPoint), key, CommandFlags.NoRedirect)); var ex = Assert.Throws<RedisServerException>(() => StringGet(conn.GetServer(node.EndPoint), key, CommandFlags.NoRedirect));
Assert.StartsWith($"Key has MOVED from Endpoint {rightMasterNode.EndPoint} and hashslot {slot}", ex.Message); Assert.StartsWith($"Key has MOVED from Endpoint {rightMasterNode.EndPoint} and hashslot {slot}", ex.Message);
} }
} }
} }
...@@ -625,7 +624,7 @@ public void MultiKeyQueryFails() ...@@ -625,7 +624,7 @@ public void MultiKeyQueryFails()
} }
} }
static RedisKey[] InventKeys() private static RedisKey[] InventKeys()
{ {
RedisKey[] keys = new RedisKey[512]; RedisKey[] keys = new RedisKey[512];
Random rand = new Random(12324); Random rand = new Random(12324);
......
...@@ -85,7 +85,6 @@ public void ClientName() ...@@ -85,7 +85,6 @@ public void ClientName()
var name = (string)GetAnyMaster(muxer).Execute("CLIENT", "GETNAME"); var name = (string)GetAnyMaster(muxer).Execute("CLIENT", "GETNAME");
Assert.Equal("TestRig", name); Assert.Equal("TestRig", name);
} }
} }
...@@ -100,7 +99,6 @@ public void DefaultClientName() ...@@ -100,7 +99,6 @@ public void DefaultClientName()
var name = (string)GetAnyMaster(muxer).Execute("CLIENT", "GETNAME"); var name = (string)GetAnyMaster(muxer).Execute("CLIENT", "GETNAME");
Assert.Equal(Environment.MachineName, name); Assert.Equal(Environment.MachineName, name);
} }
} }
......
...@@ -152,7 +152,8 @@ private static void CheckString(RedisValue value, string expected) ...@@ -152,7 +152,8 @@ private static void CheckString(RedisValue value, string expected)
private static byte[] Bytes(string s) => s == null ? null : Encoding.UTF8.GetBytes(s); private static byte[] Bytes(string s) => s == null ? null : Encoding.UTF8.GetBytes(s);
string LineNumber([CallerLineNumber] int lineNumber = 0) => lineNumber.ToString(); private string LineNumber([CallerLineNumber] int lineNumber = 0) => lineNumber.ToString();
[Fact] [Fact]
public void RedisValueStartsWith() public void RedisValueStartsWith()
{ {
......
...@@ -67,8 +67,10 @@ public async Task ConnectToSSLServer(bool useSsl, bool specifyHost) ...@@ -67,8 +67,10 @@ public async Task ConnectToSSLServer(bool useSsl, bool specifyHost)
SyncTimeout = Debugger.IsAttached ? int.MaxValue : 5000, SyncTimeout = Debugger.IsAttached ? int.MaxValue : 5000,
Password = password, Password = password,
}; };
var map = new Dictionary<string, string>(); var map = new Dictionary<string, string>
map["config"] = null; // don't rely on config working {
["config"] = null // don't rely on config working
};
if (!isAzure) map["cluster"] = null; if (!isAzure) map["cluster"] = null;
config.CommandMap = CommandMap.Create(map); config.CommandMap = CommandMap.Create(map);
if (port != null) config.EndPoints.Add(server, port.Value); if (port != null) config.EndPoints.Add(server, port.Value);
...@@ -322,7 +324,6 @@ public void SSLParseViaConfig_Issue883_ConfigObject() ...@@ -322,7 +324,6 @@ public void SSLParseViaConfig_Issue883_ConfigObject()
} }
} }
[Fact] [Fact]
public void SSLParseViaConfig_Issue883_ConfigString() public void SSLParseViaConfig_Issue883_ConfigString()
{ {
......
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