diff options
author | Harald Musum <musum@oath.com> | 2018-02-09 16:19:32 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-02-09 16:19:32 +0100 |
commit | f5004875b8c1d27d539a0887ed11078f1d195643 (patch) | |
tree | 3aeebb34fe435b008116f629c3dfe747425c2df3 | |
parent | 49bc16613efaa6d4deae1b8a1a94d540259b7dc1 (diff) |
Remove from mock too
2 files changed, 1 insertions, 7 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java index dcc590180f2..d518867407a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java @@ -12,7 +12,6 @@ import java.util.Set; */ public class MockFileDBHandler implements FileDistribution { public int sendDeployedFilesCalled = 0; - public int reloadDeployFileDistributorCalled = 0; public int removeDeploymentsThatHaveDifferentApplicationIdCalled = 0; @Override @@ -26,9 +25,7 @@ public class MockFileDBHandler implements FileDistribution { } @Override - public void reloadDeployFileDistributor() { - reloadDeployFileDistributorCalled++; - } + public void reloadDeployFileDistributor() {} @Override public void removeDeploymentsThatHaveDifferentApplicationId(Collection<String> targetHostnames) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java index 2069ae48d76..ac16f1f71a7 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java @@ -126,15 +126,12 @@ public class SessionPreparerTest extends TestWithCurator { new PrepareParams.Builder().dryRun(true).timeoutBudget(TimeoutBudgetTest.day()).build(), Optional.empty(), tenantPath, Instant.now()); assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().sendDeployedFilesCalled, is(0)); - assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().reloadDeployFileDistributorCalled, is(0)); } @Test public void require_that_application_is_prepared() throws Exception { preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath, Instant.now()); assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().sendDeployedFilesCalled, is(2)); - // Should be called only once no matter how many model versions are built - assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().reloadDeployFileDistributorCalled, is(1)); assertTrue(configCurator.exists(sessionsPath.append(ConfigCurator.USERAPP_ZK_SUBPATH).append("services.xml").getAbsolute())); } |