aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-process
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-12-09 23:16:18 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-12-09 23:16:18 +0100
commitb1ce54aa633f8773f7e149406837f6c96a420d8c (patch)
treeabe6599c90ca519128599f0d8ae9c38380860cd8 /server/sonar-process
parent0e74c4e6f9d352fe7965a63f6a1a48db2b56be49 (diff)
downloadsonarqube-b1ce54aa633f8773f7e149406837f6c96a420d8c.tar.gz
sonarqube-b1ce54aa633f8773f7e149406837f6c96a420d8c.zip
Upgrade to JUnit 4.12
Diffstat (limited to 'server/sonar-process')
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/ProcessEntryPointTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/server/sonar-process/src/test/java/org/sonar/process/ProcessEntryPointTest.java b/server/sonar-process/src/test/java/org/sonar/process/ProcessEntryPointTest.java
index 9560c3c7f38..e24f51b62e1 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/ProcessEntryPointTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/ProcessEntryPointTest.java
@@ -22,7 +22,9 @@ package org.sonar.process;
import org.apache.commons.io.FileUtils;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.DisableOnDebug;
import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestRule;
import org.junit.rules.Timeout;
import org.sonar.process.Lifecycle.State;
import org.sonar.process.test.StandardProcess;
@@ -42,7 +44,7 @@ public class ProcessEntryPointTest {
* Safeguard
*/
@Rule
- public Timeout timeout = new Timeout(10000);
+ public TestRule timeout = new DisableOnDebug(Timeout.seconds(10));
@Rule
public TemporaryFolder temp = new TemporaryFolder();