aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-11-09 16:22:08 +0100
committerSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-11-16 10:09:21 +0100
commit38242dc18f85afbf8a134ffbe48be5cf8e98eceb (patch)
treed2dfa6f404fa73d11c9189fae7a4cb56c6a060a4 /tests
parent8acb0ed17df2a9c87a8fabaa43acfcddfdb0896f (diff)
downloadsonarqube-38242dc18f85afbf8a134ffbe48be5cf8e98eceb.tar.gz
sonarqube-38242dc18f85afbf8a134ffbe48be5cf8e98eceb.zip
SONAR-8333 use orchestrator 3.13-build783 to fix SQ ITs based on logs
Diffstat (limited to 'tests')
-rw-r--r--tests/perf/src/main/java/org/sonarsource/sonarqube/perf/ServerLogs.java6
-rw-r--r--tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/ServerLogs.java b/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/ServerLogs.java
index 9bacd727c2f..5549395c963 100644
--- a/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/ServerLogs.java
+++ b/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/ServerLogs.java
@@ -56,8 +56,8 @@ public class ServerLogs {
}
public static void clear(Orchestrator orch) throws IOException {
- if (orch.getServer() != null && orch.getServer().getLogs() != null) {
- FileUtils.write(orch.getServer().getLogs(), "", false);
+ if (orch.getServer() != null && orch.getServer().getCeLogs() != null) {
+ FileUtils.write(orch.getServer().getCeLogs(), "", false);
}
}
@@ -65,7 +65,7 @@ public class ServerLogs {
* 2015.09.29 16:57:45 INFO ce[o.s.s.c.q.CeWorkerRunnableImpl] Executed task | project=com.github.kevinsawicki:http-request-parent | id=AVAZm9oHIXrp54OmOeQe | time=2283ms
*/
public static Long extractComputationTotalTime(Orchestrator orchestrator) throws IOException {
- File report = orchestrator.getServer().getLogs();
+ File report = orchestrator.getServer().getCeLogs();
List<String> logsLines = FileUtils.readLines(report, Charsets.UTF_8);
return extractComputationTotalTime(logsLines);
}
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
index d0c17e807ff..b53b5efb9ac 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
@@ -106,6 +106,6 @@ public class ServerTest extends PerfTestCase {
}
private static List<String> readLogLines(Orchestrator orchestrator) throws IOException {
- return FileUtils.readLines(orchestrator.getServer().getLogs());
+ return FileUtils.readLines(orchestrator.getServer().getCeLogs());
}
}