fix postgres tests (Netflix#194)

FRINXio · Nov 6, 2023 · 7c31632 · 7c31632
1 parent 145e19d
commit 7c31632
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 42 deletions.
diff --git a/...ersistence/src/main/java/com/netflix/conductor/postgres/config/PostgresConfiguration.java b/...ersistence/src/main/java/com/netflix/conductor/postgres/config/PostgresConfiguration.java
@@ -95,7 +95,7 @@ public PostgresQueueDAO postgresQueueDAO(
 
     @Bean
     @DependsOn({"flywayForPrimaryDb"})
-    @Conditional(PostgresIndexConditions.PostgresIndexingEnabled.class)
+    @ConditionalOnProperty(name = "conductor.indexing.type", havingValue = "postgres")
     public PostgresIndexDAO postgresIndexDAO(
             @Qualifier("postgresRetryTemplate") RetryTemplate retryTemplate,
             ObjectMapper objectMapper) {

diff --git a/...sistence/src/main/java/com/netflix/conductor/postgres/config/PostgresIndexConditions.java b/...sistence/src/main/java/com/netflix/conductor/postgres/config/PostgresIndexConditions.java
diff --git a/...es-persistence/src/test/java/com/netflix/conductor/postgres/dao/PostgresIndexDAOTest.java b/...es-persistence/src/test/java/com/netflix/conductor/postgres/dao/PostgresIndexDAOTest.java
@@ -30,6 +30,7 @@
 import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.netflix.conductor.common.config.TestObjectMapperConfiguration;
@@ -53,6 +54,12 @@
             FlywayAutoConfiguration.class
         })
 @RunWith(SpringRunner.class)
+@TestPropertySource(
+        properties = {
+            "conductor.app.asyncIndexingEnabled=false",
+            "conductor.elasticsearch.version=0",
+            "conductor.indexing.type=postgres"
+        })
 @SpringBootTest
 public class PostgresIndexDAOTest {