SONAR-17088 Increase default timeout of scanner report publishing to 60 sec

- Add scan property  `sonar.report.publish.timeout`

2 files changed, 12 insertions, 2 deletions

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ReportPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ReportPublisherTest.java
index ae2f877d384..5be9155e320 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ReportPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ReportPublisherTest.java
@@ -103,7 +103,9 @@ public class ReportPublisherTest {
   }
 
   @Test
-  public void use_30s_write_timeout() {
+  public void use_write_timeout_from_properties() {
+    when(properties.reportPublishTimeout()).thenReturn(60);
+
     MockWsResponse submitMockResponse = new MockWsResponse();
     submitMockResponse.setContent(Ce.SubmitResponse.newBuilder().setTaskId("task-1234").build().toByteArray());
     when(wsClient.call(any())).thenReturn(submitMockResponse);
@@ -111,7 +113,7 @@ public class ReportPublisherTest {
     underTest.start();
     underTest.execute();
 
-    verify(wsClient).call(argThat(req -> (req).getWriteTimeOutInMs().orElse(0) == 30_000));
+    verify(wsClient).call(argThat(req -> (req).getWriteTimeOutInMs().orElse(0) == 60_000));
   }
 
   @Test
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ScanPropertiesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ScanPropertiesTest.java
index effa108aeae..4ccedb3bb22 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ScanPropertiesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ScanPropertiesTest.java
@@ -65,6 +65,14 @@ public class ScanPropertiesTest {
   }
 
   @Test
+  public void should_define_report_publish_timeout() {
+    assertThat(underTest.reportPublishTimeout()).isEqualTo(60);
+
+    settings.setProperty("sonar.ws.report.timeout", "10");
+    assertThat(underTest.reportPublishTimeout()).isEqualTo(10);
+  }
+
+  @Test
   public void should_define_preload_file_metadata() {
     settings.setProperty("sonar.preloadFileMetadata", "true");
     assertThat(underTest.preloadFileMetadata()).isTrue();