diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-16 18:23:16 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-16 18:23:16 +0200 |
| commit | 568d2097670bc3c8fd71f914ea425ec551ec0d5c (patch) | |
| tree | 96e26f94d2c3c93a93840fe95e42cee6199dfdf0 /server/sonar-process-monitor | |
| parent | 5517f0046ea9def1e9c33b7de44fa85ed7bc1c36 (diff) | |
| parent | 6acdf9558a64ab365432c75aa57d5c3f0c7c096a (diff) | |
| download | sonarqube-568d2097670bc3c8fd71f914ea425ec551ec0d5c.tar.gz sonarqube-568d2097670bc3c8fd71f914ea425ec551ec0d5c.zip | |
Merge remote-tracking branch 'remotes/origin/branch-4.5'
Diffstat (limited to 'server/sonar-process-monitor')
| -rw-r--r-- | server/sonar-process-monitor/src/test/java/org/sonar/process/monitor/MonitorTest.java | 2 |
1 files changed, 1 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 043054c40ee..171f5669fbc 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 @@ -368,7 +368,7 @@ public class MonitorTest { void kill() { try { HttpRequest.post("http://localhost:" + httpPort + "/kill") - .readTimeout(500).connectTimeout(500).ok(); + .readTimeout(5000).connectTimeout(5000).ok(); } catch (Exception e) { // HTTP request can't be fully processed, as web server hardly // calls "System.exit()" |