diff options
Diffstat (limited to 'server/sonar-process')
3 files changed, 6 insertions, 7 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 3b045b6a0dc..68996625c72 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 @@ -43,13 +43,10 @@ import static org.sonar.process.ProcessEntryPoint.PROPERTY_TERMINATION_TIMEOUT; public class ProcessEntryPointTest { - SystemExit exit = mock(SystemExit.class); + private SystemExit exit = mock(SystemExit.class); - /** - * Safeguard - */ @Rule - public TestRule timeout = new DisableOnDebug(Timeout.seconds(60)); + public TestRule safeguardTimeout = new DisableOnDebug(Timeout.seconds(60)); @Rule public TemporaryFolder temp = new TemporaryFolder(); diff --git a/server/sonar-process/src/test/java/org/sonar/process/ProcessUtilsTest.java b/server/sonar-process/src/test/java/org/sonar/process/ProcessUtilsTest.java index d1f872b904d..b88ca719cd5 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/ProcessUtilsTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/ProcessUtilsTest.java @@ -21,6 +21,8 @@ package org.sonar.process; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.DisableOnDebug; +import org.junit.rules.TestRule; import org.junit.rules.Timeout; import org.sonar.test.TestUtils; @@ -30,7 +32,7 @@ import static org.sonar.process.ProcessUtils.awaitTermination; public class ProcessUtilsTest { @Rule - public Timeout timeout = Timeout.seconds(5); + public TestRule safeguardTimeout = new DisableOnDebug(Timeout.seconds(60)); @Test public void private_constructor() { diff --git a/server/sonar-process/src/test/java/org/sonar/process/StopWatcherTest.java b/server/sonar-process/src/test/java/org/sonar/process/StopWatcherTest.java index 970a1e4bdc9..9938ae1050c 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/StopWatcherTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/StopWatcherTest.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.when; public class StopWatcherTest { @Rule - public TestRule safeguard = new DisableOnDebug(Timeout.seconds(10)); + public TestRule safeguardTimeout = new DisableOnDebug(Timeout.seconds(60)); @Test public void stop_if_receive_command() throws Exception { |