From 6f0f75643b1115f07fc63014fa4bf3f4f5698404 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 2 Aug 2018 17:02:37 +0200 Subject: [PATCH] Allow bean override to pass tests. See gh-235. --- .../vault/config/databases/VaultConfigMySqlDatabaseTests.java | 3 ++- .../cloud/vault/config/databases/VaultConfigMySqlTests.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java index 0cc211a8..60412e71 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java @@ -52,7 +52,8 @@ import static org.junit.Assume.*; @SpringBootTest(classes = VaultConfigMySqlDatabaseTests.TestApplication.class, properties = { "spring.cloud.vault.database.enabled=true", "spring.cloud.vault.database.role=readonly", - "spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=UTC" }) + "spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=UTC", + "spring.main.allow-bean-definition-overriding=true" }) public class VaultConfigMySqlDatabaseTests { private final static int MYSQL_PORT = 3306; diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java index 2b788f75..ad07888e 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java @@ -49,7 +49,8 @@ import static org.junit.Assume.*; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = VaultConfigMySqlTests.TestApplication.class, properties = { "spring.cloud.vault.mysql.enabled=true", "spring.cloud.vault.mysql.role=readonly", - "spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=UTC" }) + "spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=UTC", + "spring.main.allow-bean-definition-overriding=true" }) public class VaultConfigMySqlTests { private final static int MYSQL_PORT = 3306;