Commit d66bc7b1 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.3.x'

parents 2c8d4421 d3074a08
...@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringApplicationConfiguration(SampleCassandraApplication.class) @SpringApplicationConfiguration(SampleCassandraApplication.class)
@IntegrationTest("spring.data.cassandra.port=9142") @IntegrationTest("spring.data.cassandra.port=9142")
@CassandraDataSet(keyspace = "mykeyspace", value = "setup.cql") @CassandraDataSet(keyspace = "mykeyspace", value = "setup.cql")
@EmbeddedCassandra @EmbeddedCassandra(timeout = 60000)
public class SampleCassandraApplicationTests { public class SampleCassandraApplicationTests {
@ClassRule @ClassRule
......
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