From 85535f0882eeff55596cb3c4c0ebd0c23213154d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 7 Jul 2015 22:17:10 -0700 Subject: [PATCH] Disable DB migrations in ApplicationHierarchyTests --- .../autoconfigure/SpringApplicationHierarchyTests.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java index ad43b604a47..18d559c3bc3 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java @@ -42,14 +42,17 @@ public class SpringApplicationHierarchyTests { @Test public void testParent() { SpringApplicationBuilder builder = new SpringApplicationBuilder(Child.class); + builder.properties("flyway.enabled=false", "liquibase.enabled=false"); builder.parent(Parent.class); this.context = builder.run("--server.port=0"); } @Test public void testChild() { - this.context = new SpringApplicationBuilder(Parent.class).child(Child.class).run( - "--server.port=0"); + SpringApplicationBuilder builder = new SpringApplicationBuilder(Parent.class); + builder.properties("flyway.enabled=false", "liquibase.enabled=false"); + builder.child(Child.class); + this.context = builder.run("--server.port=0"); } @EnableAutoConfiguration(exclude = { ElasticsearchDataAutoConfiguration.class,