aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-process-monitor
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2015-06-16 10:30:07 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2015-06-16 10:30:22 +0200
commit5f0a8f2ff2804c36cb201d390dc5ff3425c2cac7 (patch)
treef517dbe9cb0d27e42fb51d059a2a3df965161c34 /server/sonar-process-monitor
parent079aef3828bafa650436ebd4258776bb395c8431 (diff)
downloadsonarqube-5f0a8f2ff2804c36cb201d390dc5ff3425c2cac7.tar.gz
sonarqube-5f0a8f2ff2804c36cb201d390dc5ff3425c2cac7.zip
Increase some timeouts in tests
Diffstat (limited to 'server/sonar-process-monitor')
-rw-r--r--server/sonar-process-monitor/src/test/java/org/sonar/process/monitor/MonitorTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/process/monitor/MonitorTest.java b/server/sonar-process-monitor/src/test/java/org/sonar/process/monitor/MonitorTest.java
index 00ae573ed6a..3edd35324a9 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/process/monitor/MonitorTest.java
+++ b/server/sonar-process-monitor/src/test/java/org/sonar/process/monitor/MonitorTest.java
@@ -30,7 +30,9 @@ import org.junit.After;
import org.junit.BeforeClass;
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.NetworkUtils;
@@ -74,7 +76,7 @@ public class MonitorTest {
* Safeguard
*/
@Rule
- public Timeout globalTimeout = Timeout.seconds(30);
+ public TestRule globalTimeout = new DisableOnDebug(Timeout.seconds(60));
/**
* Temporary directory is used to interact with monitored processes, which write in it.