Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Add ability to disable healthchecks Change-Id: I20542eb085b815f40e8b5c5ad65cbf22dfd2274e
diff --git a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java index 9f481ff..99edf59 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java
@@ -59,7 +59,7 @@ for (int i = 0; i < numChanges; i++) { createChange("refs/for/master"); } - accounts.create(config.getUsername(HealthCheckNames.AUTH)); + accountCreator.create(config.getUsername(HealthCheckNames.AUTH)); } @Test
diff --git a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/ProjectsListHealthCheckTest.java b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/ProjectsListHealthCheckTest.java index 0d29109..564ccd2 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/ProjectsListHealthCheckTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/ProjectsListHealthCheckTest.java
@@ -61,7 +61,7 @@ } private ListProjects getFailingProjectList() { - return new ListProjects(null, null, null, null, null, null, null) { + return new ListProjects(null, null, null, null, null, null, null, null) { @Override public SortedMap<String, ProjectInfo> apply() throws BadRequestException { throw new IllegalArgumentException("Unable to return project list"); @@ -70,7 +70,7 @@ } private ListProjects getWorkingProjectList(long execTime) { - return new ListProjects(null, null, null, null, null, null, null) { + return new ListProjects(null, null, null, null, null, null, null, null) { @Override public SortedMap<String, ProjectInfo> apply() throws BadRequestException { SortedMap<String, ProjectInfo> projects = new TreeMap<>();