diff options
Diffstat (limited to 'configserver/src/test/java/com/yahoo')
2 files changed, 8 insertions, 3 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/MockConfigConvergenceChecker.java b/configserver/src/test/java/com/yahoo/vespa/config/server/MockConfigConvergenceChecker.java index b21d89fa626..e63fdf9bf19 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/MockConfigConvergenceChecker.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/MockConfigConvergenceChecker.java @@ -21,7 +21,7 @@ public class MockConfigConvergenceChecker extends ConfigConvergenceChecker { } @Override - public ServiceListResponse getConfigGenerationsForAllServices(Application application, Duration timeoutPerService) { + public ServiceListResponse checkConvergenceForAllServices(Application application, Duration timeoutPerService) { return new ServiceListResponse(Map.of(), wantedGeneration, wantedGeneration); } @@ -30,4 +30,9 @@ public class MockConfigConvergenceChecker extends ConfigConvergenceChecker { return new ServiceResponse(ServiceResponse.Status.ok, wantedGeneration); } + @Override + public ServiceListResponse checkConvergenceUnlessDeferringChangesUntilRestart(Application application, Duration timeoutPerService) { + return new ServiceListResponse(Map.of(), wantedGeneration, wantedGeneration); + } + } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java index 148cd8ac24f..6016ce991d0 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java @@ -91,7 +91,7 @@ public class ConfigConvergenceCheckerTest { { wireMock.stubFor(get(urlEqualTo("/state/v1/config")).willReturn(okJson("{\"config\":{\"generation\":3}}"))); - ServiceListResponse response = checker.getConfigGenerationsForAllServices(application, clientTimeout); + ServiceListResponse response = checker.checkConvergenceForAllServices(application, clientTimeout); assertEquals(3, response.wantedGeneration); assertEquals(3, response.currentGeneration); assertTrue(response.converged); @@ -114,7 +114,7 @@ public class ConfigConvergenceCheckerTest { URI requestUrl = testServer().resolve("/serviceconverge"); - ServiceListResponse response = checker.getConfigGenerationsForAllServices(application, clientTimeout); + ServiceListResponse response = checker.checkConvergenceForAllServices(application, clientTimeout); assertEquals(4, response.wantedGeneration); assertEquals(3, response.currentGeneration); assertFalse(response.converged); |