Browse Source

SONAR-11683 Do not resolve version for SLB and PR

tags/7.7
Janos Gyerik 5 years ago
parent
commit
0f580cd4d1

+ 1
- 1
server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStep.java View File

@@ -100,7 +100,7 @@ public class LoadPeriodsStep implements ComputationStep {

@Override
public void execute(ComputationStep.Context context) {
if (analysisMetadataHolder.isFirstAnalysis()) {
if (analysisMetadataHolder.isFirstAnalysis() || !analysisMetadataHolder.isLongLivingBranch()) {
periodsHolder.setPeriod(null);
return;
}

+ 12
- 0
server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStepTest.java View File

@@ -112,6 +112,7 @@ public class LoadPeriodsStepTest extends BaseStepTest {
@Before
public void setUp() throws Exception {
november30th2008 = DATE_FORMAT.parse("2008-11-30");
when(analysisMetadataHolder.isLongLivingBranch()).thenReturn(true);
}

@Test
@@ -845,6 +846,17 @@ public class LoadPeriodsStepTest extends BaseStepTest {
verifyDebugLogs("Resolving new code period by version: 0.9");
}

@Test
@UseDataProvider("anyValidLeakPeriodSettingValue")
public void leak_period_setting_is_ignored_for_SLB_or_PR(String leakPeriodSettingValue) {
when(analysisMetadataHolder.isLongLivingBranch()).thenReturn(false);

settings.setProperty("sonar.leak.period", leakPeriodSettingValue);
underTest.execute(new TestComputationStepContext());

assertThat(periodsHolder.hasPeriod()).isFalse();
}

private void assertPeriod(String mode, @Nullable String modeParameter, long snapshotDate, String analysisUuid) {
Period period = periodsHolder.getPeriod();
assertThat(period).isNotNull();

Loading…
Cancel
Save