Fail fast when setting sonar.internal.analysis.failFast (SonarSource#632)

pynicolas · web-flow · commit d394b2b5568b · 2020-03-12T16:42:00.000+01:00
diff --git a/its/ruling/src/test/java/org/sonar/python/it/PythonRulingTest.java b/its/ruling/src/test/java/org/sonar/python/it/PythonRulingTest.java
@@ -72,6 +72,7 @@ public void test() throws Exception {
       .setProperty("dump.new", FileLocation.of("target/actual").getFile().getAbsolutePath())
       .setProperty("sonar.cpd.exclusions", "**/*")
       .setProperty("lits.differences", litsDifferencesFile.getAbsolutePath())
+      .setProperty("sonar.internal.analysis.failFast", "true")
       .setEnvironmentVariable("SONAR_RUNNER_OPTS", "-Xmx2000m");
     ORCHESTRATOR.executeBuild(build);
 
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/Scanner.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/Scanner.java
@@ -31,6 +31,7 @@
 
 abstract class Scanner {
   private static final Logger LOG = Loggers.get(Scanner.class);
+  private static final String FAIL_FAST_PROPERTY_NAME = "sonar.internal.analysis.failFast";
   protected final SensorContext context;
 
   Scanner(SensorContext context) {
@@ -51,6 +52,9 @@ void execute(List<InputFile> files, SensorContext context) {
         this.scanFile(file);
       } catch (Exception e) {
         this.processException(e, file);
+        if (context.config().getBoolean(FAIL_FAST_PROPERTY_NAME).orElse(false)) {
+          throw new IllegalStateException("Exception when analyzing " + file, e);
+        }
       } finally {
         progressReport.nextFile();
       }
diff --git a/sonar-python-plugin/src/test/java/org/sonar/plugins/python/PythonSensorTest.java b/sonar-python-plugin/src/test/java/org/sonar/plugins/python/PythonSensorTest.java
@@ -20,6 +20,7 @@
 package org.sonar.plugins.python;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -50,6 +51,7 @@
 import org.sonar.api.batch.sensor.internal.SensorContextTester;
 import org.sonar.api.batch.sensor.issue.Issue;
 import org.sonar.api.batch.sensor.issue.IssueLocation;
+import org.sonar.api.config.internal.MapSettings;
 import org.sonar.api.internal.SonarRuntimeImpl;
 import org.sonar.api.issue.NoSonarFilter;
 import org.sonar.api.measures.CoreMetrics;
@@ -67,6 +69,7 @@
 import org.sonar.python.checks.CheckList;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -344,6 +347,20 @@ public void test_exception_does_not_fail_analysis() throws IOException {
     assertThat(context.allIssues()).hasSize(2);
   }
 
+  @Test
+  public void test_exception_should_fail_analysis_if_configured_so() throws IOException {
+    DefaultInputFile inputFile = spy(createInputFile(FILE_1));
+    when(inputFile.contents()).thenThrow(FileNotFoundException.class);
+    context.fileSystem().add(inputFile);
+
+    activeRules = new ActiveRulesBuilder().build();
+    context.setSettings(new MapSettings().setProperty("sonar.internal.analysis.failFast", "true"));
+
+    assertThatThrownBy(() -> sensor().execute(context))
+      .isInstanceOf(IllegalStateException.class)
+      .hasCauseInstanceOf(FileNotFoundException.class);
+  }
+
   @Test
   public void parse_error() {
     inputFile("parse_error.py");
@@ -392,17 +409,21 @@ private PythonSensor sensor(@Nullable PythonCustomRuleRepository[] customRuleRep
   }
 
   private InputFile inputFile(String name) {
-    DefaultInputFile inputFile = TestInputFileBuilder.create("moduleKey", name)
-      .setModuleBaseDir(baseDir.toPath())
-      .setCharset(StandardCharsets.UTF_8)
-      .setType(Type.MAIN)
-      .setLanguage(Python.KEY)
-      .initMetadata(TestUtils.fileContent(new File(baseDir, name), StandardCharsets.UTF_8))
-      .build();
+    DefaultInputFile inputFile = createInputFile(name);
     context.fileSystem().add(inputFile);
     return inputFile;
   }
 
+  private DefaultInputFile createInputFile(String name) {
+    return TestInputFileBuilder.create("moduleKey", name)
+        .setModuleBaseDir(baseDir.toPath())
+        .setCharset(StandardCharsets.UTF_8)
+        .setType(Type.MAIN)
+        .setLanguage(Python.KEY)
+        .initMetadata(TestUtils.fileContent(new File(baseDir, name), StandardCharsets.UTF_8))
+        .build();
+  }
+
   private void verifyUsages(String componentKey, int line, int offset, TextRange... trs) {
     Collection<TextRange> textRanges = context.referencesForSymbolAt(componentKey, line, offset);
     assertThat(textRanges).containsExactly(trs);
