SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed surefire and failsafe plugins setup, fixed docker tests

Browse Source
This commit is contained in:
Marcin Grzejszczak
2016-01-11 10:53:20 +01:00
parent 104eac4020
commit ff7e4ffa8a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@@ -175,7 +175,7 @@
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
<maven.compiler.testSource>1.8</maven.compiler.testSource>
<surefire.plugin.version>2.9</surefire.plugin.version>
<surefire.plugin.version>2.19.1</surefire.plugin.version>
</properties>
<profiles>
@@ -235,7 +235,7 @@
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<version>${surefire.plugin.version}</version>
<configuration>
<useFile>false</useFile>
<includes>
@@ -244,11 +244,19 @@
</configuration>
<executions>
<execution>
<id>integration-test</id>
<id>failsafe-integration-tests</id>
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
</goals>
</execution>
<execution>
<id>failsafe-verify</id>
<phase>verify</phase>
<goals>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java
View File

@@ -29,7 +29,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
abstract public class AbstractIntegrationTest {
@Value("${test.pollinterval:1}") protected int pollInterval;
@Value("${test.timeout:1}") protected int timeout;
@Value("${test.timeout:10}") protected int timeout;
protected ConditionFactory await() {
return Awaitility.await().pollInterval(pollInterval, SECONDS).atMost(timeout, SECONDS);