Skip to content

Fixed tests for lettuce 7.x #9746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ValentinZakharov merged 1 commit into from
Oct 14, 2025
Merged

Fixed tests for lettuce 7.x #9746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ de.thetaphi:forbiddenapis:3.8=compileClasspath
info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
io.leangen.geantyref:geantyref:1.3.16=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
io.lettuce:lettuce-core:5.0.0.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath
io.lettuce:lettuce-core:6.8.1.RELEASE=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
io.lettuce:lettuce-core:7.0.0.BETA2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
io.netty:netty-buffer:4.1.118.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
io.netty:netty-buffer:4.1.15.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-codec-dns:4.1.118.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
Expand Down
10 changes: 6 additions & 4 deletions ...-agent/instrumentation/lettuce/lettuce-5.0/src/test/groovy/Lettuce5AsyncClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ abstract class Lettuce5AsyncClientTest extends Lettuce5ClientTestBase {
def "command completes exceptionally"() {
setup:
// turn off auto flush to complete the command exceptionally manually
asyncCommands.setAutoFlushCommands(false)
connection.setAutoFlushCommands(false)
def conds = new AsyncConditions()
RedisFuture redisFuture = asyncCommands.del("key1", "key2")
boolean completedExceptionally = ((AsyncCommand) redisFuture).completeExceptionally(new IllegalStateException("TestException"))
Expand All @@ -371,7 +371,8 @@ abstract class Lettuce5AsyncClientTest extends Lettuce5ClientTestBase {

when:
// now flush and execute the command
asyncCommands.flushCommands()
connection.flushCommands()
connection.setAutoFlushCommands(true)
redisFuture.get()

then:
Expand Down Expand Up @@ -405,7 +406,7 @@ abstract class Lettuce5AsyncClientTest extends Lettuce5ClientTestBase {

def "cancel command before it finishes"() {
setup:
asyncCommands.setAutoFlushCommands(false)
connection.setAutoFlushCommands(false)
def conds = new AsyncConditions()
RedisFuture redisFuture = asyncCommands.sadd("SKEY", "1", "2")
redisFuture.whenCompleteAsync({ res, throwable ->
Expand All @@ -417,7 +418,8 @@ abstract class Lettuce5AsyncClientTest extends Lettuce5ClientTestBase {

when:
boolean cancelSuccess = redisFuture.cancel(true)
asyncCommands.flushCommands()
connection.flushCommands()
connection.setAutoFlushCommands(true)

then:
conds.await()
Expand Down