aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2017-12-29 14:47:49 +0100
committerDuarte Meneses <duarte.meneses@sonarsource.com>2017-12-29 15:12:23 +0100
commit01577300518f84fd5a36a9b57c7cbe44df805a96 (patch)
tree2eaaeb55d9410d09e2bc808346eb45957774ac90
parent4d6a2243d4799026ee5351261fd238fde400a8bc (diff)
downloadsonar-scanner-cli-01577300518f84fd5a36a9b57c7cbe44df805a96.tar.gz
sonar-scanner-cli-01577300518f84fd5a36a9b57c7cbe44df805a96.zip
Fix ITs
-rw-r--r--it/src/test/java/com/sonarsource/scanner/it/JavaTest.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/it/src/test/java/com/sonarsource/scanner/it/JavaTest.java b/it/src/test/java/com/sonarsource/scanner/it/JavaTest.java
index 1f53a88..dd7b296 100644
--- a/it/src/test/java/com/sonarsource/scanner/it/JavaTest.java
+++ b/it/src/test/java/com/sonarsource/scanner/it/JavaTest.java
@@ -27,6 +27,7 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.fest.assertions.Condition;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
@@ -290,7 +291,12 @@ public class JavaTest extends ScannerTestCase {
BuildResult executeBuild = orchestrator.executeBuildQuietly(build);
assertThat(executeBuild.getStatus()).isNotEqualTo(0);
String logs = executeBuild.getLogs();
- assertThat(logs).contains("java.lang.OutOfMemoryError");
+ assertThat(logs).satisfies(new Condition<String>() {
+ @Override
+ public boolean matches(String value) {
+ return value.contains("java.lang.OutOfMemoryError") || value.contains("GC overhead limit exceeded");
+ }
+ });
}
}