From fa9105db728c9932e9b18edeb907f81a7b50d5da Mon Sep 17 00:00:00 2001 From: slorello89 Date: Thu, 15 Feb 2024 08:32:13 -0500 Subject: [PATCH 1/3] updating StackExchange.Redis Version to remove System.Drawing dependency. --- src/Redis.OM.POC/Redis.OM.POC.csproj | 2 +- src/Redis.OM/Redis.OM.csproj | 2 +- src/Redis.OM/RedisReply.cs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Redis.OM.POC/Redis.OM.POC.csproj b/src/Redis.OM.POC/Redis.OM.POC.csproj index be0711b3..474b33d9 100644 --- a/src/Redis.OM.POC/Redis.OM.POC.csproj +++ b/src/Redis.OM.POC/Redis.OM.POC.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Redis.OM/Redis.OM.csproj b/src/Redis.OM/Redis.OM.csproj index 0cee403e..1c1b592f 100644 --- a/src/Redis.OM/Redis.OM.csproj +++ b/src/Redis.OM/Redis.OM.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/Redis.OM/RedisReply.cs b/src/Redis.OM/RedisReply.cs index 7bb5b458..0242e26c 100644 --- a/src/Redis.OM/RedisReply.cs +++ b/src/Redis.OM/RedisReply.cs @@ -25,23 +25,23 @@ public class RedisReply : IConvertible /// the redisResult. public RedisReply(RedisResult result) { - switch (result.Type) + switch (result.Resp2Type) { case ResultType.None: break; case ResultType.SimpleString: case ResultType.BulkString: - _raw = (byte[])result; + _raw = (byte[])result!; break; case ResultType.Error: Error = true; - _raw = (byte[])result; + _raw = (byte[])result!; break; case ResultType.Integer: _internalLong = (long)result; break; - case ResultType.MultiBulk: - _values = ((RedisResult[])result).Select(x => new RedisReply(x)).ToArray(); + case ResultType.Array: + _values = ((RedisResult[])result!).Select(x => new RedisReply(x)).ToArray(); break; } } From 9975c58389c6e60a7dd2b04abb8fef557dea30d4 Mon Sep 17 00:00:00 2001 From: slorello89 Date: Thu, 15 Feb 2024 08:53:23 -0500 Subject: [PATCH 2/3] fixing search test --- test/Redis.OM.Unit.Tests/CoreTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Redis.OM.Unit.Tests/CoreTests.cs b/test/Redis.OM.Unit.Tests/CoreTests.cs index c94aa0c7..aae630d1 100644 --- a/test/Redis.OM.Unit.Tests/CoreTests.cs +++ b/test/Redis.OM.Unit.Tests/CoreTests.cs @@ -476,7 +476,7 @@ public async Task SearchTimeoutTest() await Task.WhenAll(tasks); - var ex = await Assert.ThrowsAsync(async () => await collection.Take(10000).ToListAsync()); + var ex = await Assert.ThrowsAsync(async () => await collection.Take(10000).ToListAsync()); Assert.Equal("Encountered timeout when searching - check the duration of your query.", ex.Message); } } From 429826052e7cd9aadd33edb9918948f3b5179c86 Mon Sep 17 00:00:00 2001 From: slorello89 Date: Thu, 15 Feb 2024 09:21:37 -0500 Subject: [PATCH 3/3] ok lets try this --- test/Redis.OM.Unit.Tests/CoreTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Redis.OM.Unit.Tests/CoreTests.cs b/test/Redis.OM.Unit.Tests/CoreTests.cs index aae630d1..5b1b464c 100644 --- a/test/Redis.OM.Unit.Tests/CoreTests.cs +++ b/test/Redis.OM.Unit.Tests/CoreTests.cs @@ -477,7 +477,7 @@ public async Task SearchTimeoutTest() await Task.WhenAll(tasks); var ex = await Assert.ThrowsAsync(async () => await collection.Take(10000).ToListAsync()); - Assert.Equal("Encountered timeout when searching - check the duration of your query.", ex.Message); + Assert.True(ex.Message.Equals("Encountered timeout when searching - check the duration of your query.") || ex.Message.Contains("Timeout limit was reached")); } } } \ No newline at end of file