Skip to content

Commit f53d60d

Browse files
committed
Do not run tests for XDELEX and XACKDEL on Valkey (take 2).
Adds `@EnabledOnCommand` guards to more integration tests to prevent running on Valkey. See #3232 Signed-off-by: Chris Bono <chris.bono@broadcom.com>
1 parent 48444b5 commit f53d60d

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStreamCommandsIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,7 @@ void xClaimJustId() {
664664
}
665665

666666
@Test // GH-3232
667+
@EnabledOnCommand("XDELEX")
667668
void xDelExShouldDeleteEntries() {
668669

669670
RecordId messageId1 = connection.streamCommands()
@@ -691,6 +692,7 @@ void xDelExShouldDeleteEntries() {
691692
}
692693

693694
@Test // GH-3232
695+
@EnabledOnCommand("XDELEX")
694696
void xDelExWithStringIdsShouldDeleteEntries() {
695697

696698
RecordId messageId1 = connection.streamCommands()
@@ -712,6 +714,7 @@ void xDelExWithStringIdsShouldDeleteEntries() {
712714
}
713715

714716
@Test // GH-3232
717+
@EnabledOnCommand("XACKDEL")
715718
void xAckDelShouldAcknowledgeAndDeleteEntries() {
716719

717720
RecordId messageId1 = connection.streamCommands()
@@ -741,6 +744,7 @@ void xAckDelShouldAcknowledgeAndDeleteEntries() {
741744
}
742745

743746
@Test // GH-3232
747+
@EnabledOnCommand("XACKDEL")
744748
void xAckDelWithStringIdsShouldWork() {
745749

746750
RecordId messageId1 = connection.streamCommands()

src/test/java/org/springframework/data/redis/core/DefaultReactiveStreamOperationsIntegrationTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,7 @@ void claimShouldReadMessageDetails() {
598598
}
599599

600600
@Test // GH-3232
601+
@EnabledOnCommand("XDELEX")
601602
void deleteWithOptionsShouldDeleteEntries() {
602603

603604
K key = keyFactory.instance();
@@ -621,6 +622,7 @@ void deleteWithOptionsShouldDeleteEntries() {
621622
}
622623

623624
@Test // GH-3232
625+
@EnabledOnCommand("XDELEX")
624626
void deleteWithOptionsUsingStringIdsShouldDeleteEntries() {
625627

626628
K key = keyFactory.instance();
@@ -643,6 +645,7 @@ void deleteWithOptionsUsingStringIdsShouldDeleteEntries() {
643645
}
644646

645647
@Test // GH-3232
648+
@EnabledOnCommand("XDELEX")
646649
void deleteWithOptionsUsingRecordShouldDeleteEntry() {
647650

648651
K key = keyFactory.instance();
@@ -665,6 +668,7 @@ void deleteWithOptionsUsingRecordShouldDeleteEntry() {
665668
}
666669

667670
@Test // GH-3232
671+
@EnabledOnCommand("XACKDEL")
668672
void acknowledgeAndDeleteShouldAcknowledgeAndDeleteEntries() {
669673

670674
K key = keyFactory.instance();
@@ -690,6 +694,7 @@ void acknowledgeAndDeleteShouldAcknowledgeAndDeleteEntries() {
690694
}
691695

692696
@Test // GH-3232
697+
@EnabledOnCommand("XACKDEL")
693698
void acknowledgeAndDeleteUsingStringIdsShouldWork() {
694699

695700
K key = keyFactory.instance();
@@ -714,6 +719,7 @@ void acknowledgeAndDeleteUsingStringIdsShouldWork() {
714719
}
715720

716721
@Test // GH-3232
722+
@EnabledOnCommand("XACKDEL")
717723
void acknowledgeAndDeleteUsingRecordShouldWork() {
718724

719725
K key = keyFactory.instance();

0 commit comments

Comments
 (0)