From 5f0a8f2ff2804c36cb201d390dc5ff3425c2cac7 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 16 Jun 2015 10:30:07 +0200 Subject: [PATCH] Increase some timeouts in tests --- .../src/test/java/org/sonar/process/monitor/MonitorTest.java | 4 +++- .../test/java/org/sonar/process/ProcessEntryPointTest.java | 2 +- .../server/computation/ComputationThreadLauncherTest.java | 2 +- .../java/org/sonar/core/util/DefaultHttpDownloaderTest.java | 2 +- 4 files changed, 6 insertions(+), 4 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. 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 a24fec18704..98ac2495232 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 @@ -44,7 +44,7 @@ public class ProcessEntryPointTest { * Safeguard */ @Rule - public TestRule timeout = new DisableOnDebug(Timeout.seconds(10)); + public TestRule timeout = new DisableOnDebug(Timeout.seconds(60)); @Rule public TemporaryFolder temp = new TemporaryFolder(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationThreadLauncherTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationThreadLauncherTest.java index b12880951c6..2a2dba5605f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationThreadLauncherTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationThreadLauncherTest.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.verify; public class ComputationThreadLauncherTest { @Rule - public TestRule timeout = new DisableOnDebug(Timeout.seconds(5)); + public TestRule timeout = new DisableOnDebug(Timeout.seconds(60)); ComputationThreadLauncher sut; ReportQueue queue; diff --git a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java index 75dc1732b0a..06667f543fb 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java @@ -67,7 +67,7 @@ public class DefaultHttpDownloaderTest { public ExpectedException thrown = ExpectedException.none(); @Rule - public TestRule timeout = new DisableOnDebug(Timeout.seconds(5)); + public TestRule timeout = new DisableOnDebug(Timeout.seconds(60)); private static SocketConnection socketConnection; private static String baseUrl; -- 2.39.5