Skip to content

S
spring-boot
Commit a33dd8b9 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.0.x'

parents 1852ecc4 10b91602
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java
View file @ a33dd8b9
...@@ -50,7 +50,10 @@ public class CassandraDataAutoConfigurationIntegrationTests { ...@@ -50,7 +50,10 @@ public class CassandraDataAutoConfigurationIntegrationTests {
@Before @Before
public void setUp() { public void setUp() {
this.context = new AnnotationConfigApplicationContext(); this.context = new AnnotationConfigApplicationContext();
TestPropertyValues.of("spring.data.cassandra.port=" + cassandra.getMappedPort()) TestPropertyValues
.of("spring.data.cassandra.port=" + cassandra.getMappedPort(),
"spring.data.cassandra.read-timeout=24000",
"spring.data.cassandra.connect-timeout=10000")
.applyTo(this.context.getEnvironment()); .applyTo(this.context.getEnvironment());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment