opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16'

Browse Source 
* stable-2.16:
  SiteProgram: Normalize site path
  ScheduleConfig: Explicitly log when interval or initial delay value is invalid
  ScheduleConfig: Log at severe when startTime or interval cannot be parsed
  Clarify that schedule config's startTime hour must be zero-padded
  ScheduleConfigTest: Extend tests for schedule interval
  Highlight "starlark" as python

Change-Id: I5edde38092cbd66c6a45e8bd39b318c99dcb6341
This commit is contained in:
David Pursehouse
2019-04-11 16:30:06 +09:00
parent ded55c1d6f b09858031f
commit 2c41a9c665
5 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
javatests/com/google/gerrit/server/config/ScheduleConfigTest.java
View File

@@ -41,15 +41,18 @@ public class ScheduleConfigTest extends GerritBaseTests {
@Test
public void initialDelay() throws Exception {
assertThat(initialDelay("11:00", "1h")).isEqualTo(ms(1, HOURS));
assertThat(initialDelay("11:00", "1 hour")).isEqualTo(ms(1, HOURS));
assertThat(initialDelay("05:30", "1h")).isEqualTo(ms(30, MINUTES));
assertThat(initialDelay("09:30", "1h")).isEqualTo(ms(30, MINUTES));
assertThat(initialDelay("13:30", "1h")).isEqualTo(ms(30, MINUTES));
assertThat(initialDelay("13:59", "1h")).isEqualTo(ms(59, MINUTES));
assertThat(initialDelay("11:00", "1d")).isEqualTo(ms(1, HOURS));
assertThat(initialDelay("11:00", "1 day")).isEqualTo(ms(1, HOURS));
assertThat(initialDelay("05:30", "1d")).isEqualTo(ms(19, HOURS) + ms(30, MINUTES));
assertThat(initialDelay("11:00", "1w")).isEqualTo(ms(1, HOURS));
assertThat(initialDelay("11:00", "1 week")).isEqualTo(ms(1, HOURS));
assertThat(initialDelay("05:30", "1w")).isEqualTo(ms(7, DAYS) - ms(4, HOURS) - ms(30, MINUTES));
assertThat(initialDelay("Mon 11:00", "1w")).isEqualTo(ms(3, DAYS) + ms(1, HOURS));
@@ -200,6 +203,9 @@ public class ScheduleConfigTest extends GerritBaseTests {
rc.setString("a", null, ScheduleConfig.KEY_STARTTIME, "0100");
assertThat(ScheduleConfig.builder(rc, "a").buildSchedule()).isEmpty();
rc.setString("a", null, ScheduleConfig.KEY_STARTTIME, "1:00");
assertThat(ScheduleConfig.builder(rc, "a").buildSchedule()).isEmpty();
}
@Test