diff options
| author | Jenkins CI <ci@sonarsource.com> | 2016-05-24 15:49:44 +0200 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2016-05-24 15:49:44 +0200 |
| commit | dd67aa0a7459397e50a45712667687453f61750e (patch) | |
| tree | 40636039de20ad6a2f0c49e43ea1a1d09445243f /tests | |
| parent | 0b19ba736ef4e9132729c3043e7a783c2b0f22e8 (diff) | |
| parent | 2a29274195e513d4e8de50159cfd7e579d1e98d1 (diff) | |
| download | sonarqube-dd67aa0a7459397e50a45712667687453f61750e.tar.gz sonarqube-dd67aa0a7459397e50a45712667687453f61750e.zip | |
Automatic merge from branch-5.6
* origin/branch-5.6:
Fix version of Oracle driver for QA
Fix timeout of server startup perf test
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 866b31e247a..ca2520b0247 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 @@ -66,7 +66,7 @@ public class ServerTest extends PerfTestCase { List<String> lines = readLogLines(orchestrator); long firstStopLogDate = ServerLogs.extractFirstDate(lines).getTime(); long stopDate = extractStopDate(lines); - assertDurationLessThan(stopDate - firstStopLogDate, 10000); + assertDurationLessThan(stopDate - firstStopLogDate, 10_000); } finally { orchestrator.stop(); |