Skip to content

Fix tests failing on Jenkins #1939

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
merged 1 commit into from
Sep 13, 2024
Merged

Fix tests failing on Jenkins #1939

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
3 changes: 1 addition & 2 deletions integration-tests/src/test/java/com/datastax/oss/driver/mapper/DeleteIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@
description = ">= in WHERE clause not supported in legacy versions")
public class DeleteIT extends InventoryITBase {

private static CustomCcmRule CCM_RULE =
CustomCcmRule.builder().withCassandraConfiguration("enable_sasi_indexes", "true").build();
private static CustomCcmRule CCM_RULE = CustomCcmRule.builder().build();

private static final SessionRule<CqlSession> SESSION_RULE = SessionRule.builder(CCM_RULE).build();

Expand Down
6 changes: 5 additions & 1 deletion integration-tests/src/test/java/com/datastax/oss/driver/mapper/InventoryITBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ public abstract class InventoryITBase {
new ProductSale(MP3_DOWNLOAD.getId(), DATE_3, 7, Uuids.startOf(915192000), 0.99, 12);

protected static List<String> createStatements(BaseCcmRule ccmRule) {
return createStatements(ccmRule, false);
}

protected static List<String> createStatements(BaseCcmRule ccmRule, boolean requiresSasiIndex) {
ImmutableList.Builder<String> builder =
ImmutableList.<String>builder()
.add(
Expand All @@ -71,7 +75,7 @@ protected static List<String> createStatements(BaseCcmRule ccmRule) {
"CREATE TABLE product_sale(id uuid, day text, ts uuid, customer_id int, price "
+ "double, count int, PRIMARY KEY ((id, day), customer_id, ts))");

if (supportsSASI(ccmRule) && !isSasiBroken(ccmRule)) {
if (requiresSasiIndex && supportsSASI(ccmRule) && !isSasiBroken(ccmRule)) {
builder.add(
"CREATE CUSTOM INDEX product_description ON product(description) "
+ "USING 'org.apache.cassandra.index.sasi.SASIIndex' "
Expand Down
2 changes: 1 addition & 1 deletion ...gration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectCustomWhereClauseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public static void setup() {

SchemaChangeSynchronizer.withLock(
() -> {
for (String query : createStatements(CCM_RULE)) {
for (String query : createStatements(CCM_RULE, true)) {
session.execute(
SimpleStatement.builder(query)
.setExecutionProfile(SESSION_RULE.slowProfile())
Expand Down