Infinite timeout on upload report as long as it's asynchronous

diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java b/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java
index 53d37065bdf94dd90283aab10f67952eaa9f9c95..4031462e94a9d7d93b581f5e8d936d4a3c6723a1 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java
@@ -71,7 +71,7 @@ public class UpdateStatusJob implements BatchComponent {
     url = "/batch/upload_report?project=" + project.getEffectiveKey() + "&snapshot=" + snapshot.getId();
     try {
       LOG.debug("Publish results");
-      server.request(url, "POST");
+      server.request(url, "POST", true, 0);
     } catch (Exception e) {
       throw new IllegalStateException("Unable to publish results: " + url, e);
     }

diff --git a/sonar-batch/src/test/java/org/sonar/batch/phases/UpdateStatusJobTest.java b/sonar-batch/src/test/java/org/sonar/batch/phases/UpdateStatusJobTest.java
index d39efd3b698655b2e3b74a5dfb9bf89790377515..117bb07f8ca84cf8d8e75fd0b93837cf648a4abb 100644 (file)
--- a/sonar-batch/src/test/java/org/sonar/batch/phases/UpdateStatusJobTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/phases/UpdateStatusJobTest.java
@@ -33,7 +33,10 @@ import org.sonar.jpa.test.AbstractDbUnitTestCase;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.contains;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class UpdateStatusJobTest extends AbstractDbUnitTestCase {
 
@@ -80,7 +83,7 @@ public class UpdateStatusJobTest extends AbstractDbUnitTestCase {
 
     job.uploadReport();
     verify(serverClient).request(contains("/batch_bootstrap/evict"), eq("POST"));
-    verify(serverClient).request(contains("/batch/upload_report"), eq("POST"));
+    verify(serverClient).request(contains("/batch/upload_report"), eq("POST"), eq(true), eq(0));
   }
 
   @Test