diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 437be795..60d6a9c2 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -37,7 +37,7 @@ jobs: max-parallel: 15 fail-fast: false matrix: - redis-version: [ '8.0-RC2-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.6', '6.2.16'] + redis-version: [ '8.2-M01-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.6', '6.2.16'] dotnet-version: ['6.0', '7.0', '8.0'] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true diff --git a/tests/NRedisStack.Tests/Core Commands/CoreTests.cs b/tests/NRedisStack.Tests/Core Commands/CoreTests.cs index 61b8ec41..3f7e6189 100644 --- a/tests/NRedisStack.Tests/Core Commands/CoreTests.cs +++ b/tests/NRedisStack.Tests/Core Commands/CoreTests.cs @@ -108,9 +108,14 @@ public void TestSetInfoNull(string endpointId) int infoAfterLibNameIndex = infoAfter!.IndexOf("lib-name="); int infoBeforeLibNameIndex = infoBefore!.IndexOf("lib-name="); + int infoAfterLibVerIndex = infoAfter.IndexOf(" ", infoAfter!.IndexOf("lib-ver=")); + infoAfterLibVerIndex = infoAfterLibVerIndex == -1 ? infoAfter.Length : infoAfterLibVerIndex; + int infoBeforeLibVerIndex = infoBefore!.IndexOf(" ", infoBefore!.IndexOf("lib-ver=")); + infoBeforeLibVerIndex = infoBeforeLibVerIndex == -1 ? infoBefore.Length : infoBeforeLibVerIndex; + // Extract the sub-strings starting from "lib-name=" - string infoAfterLibNameToEnd = infoAfter.Substring(infoAfterLibNameIndex); - string infoBeforeLibNameToEnd = infoBefore.Substring(infoBeforeLibNameIndex); + string infoAfterLibNameToEnd = infoAfter.Substring(infoAfterLibNameIndex, infoAfterLibVerIndex - infoAfterLibNameIndex); + string infoBeforeLibNameToEnd = infoBefore.Substring(infoBeforeLibNameIndex, infoBeforeLibVerIndex - infoBeforeLibNameIndex); // Assert that the extracted sub-strings are equal Assert.Equal(infoAfterLibNameToEnd, infoBeforeLibNameToEnd); @@ -131,9 +136,14 @@ public async Task TestSetInfoNullAsync(string endpointId) int infoAfterLibNameIndex = infoAfter!.IndexOf("lib-name="); int infoBeforeLibNameIndex = infoBefore!.IndexOf("lib-name="); + int infoAfterLibVerIndex = infoAfter.IndexOf(" ", infoAfter!.IndexOf("lib-ver=")); + infoAfterLibVerIndex = infoAfterLibVerIndex == -1 ? infoAfter.Length : infoAfterLibVerIndex; + int infoBeforeLibVerIndex = infoBefore.IndexOf(" ", infoBefore!.IndexOf("lib-ver=")); + infoBeforeLibVerIndex = infoBeforeLibVerIndex == -1 ? infoBefore.Length : infoBeforeLibVerIndex; + // Extract the sub-strings starting from "lib-name=" - string infoAfterLibNameToEnd = infoAfter.Substring(infoAfterLibNameIndex); - string infoBeforeLibNameToEnd = infoBefore.Substring(infoBeforeLibNameIndex); + string infoAfterLibNameToEnd = infoAfter.Substring(infoAfterLibNameIndex, infoAfterLibVerIndex - infoAfterLibNameIndex); + string infoBeforeLibNameToEnd = infoBefore.Substring(infoBeforeLibNameIndex, infoBeforeLibVerIndex - infoBeforeLibNameIndex); // Assert that the extracted sub-strings are equal Assert.Equal(infoAfterLibNameToEnd, infoBeforeLibNameToEnd);