diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-12-08 13:44:47 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-12-08 13:44:47 +0100 |
commit | 637e6d823a470eeff9b2d1f91bbb9faa11b39775 (patch) | |
tree | b3c19040582eb11bbae05d1c13410445ddf1d995 /container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java | |
parent | d1e33a9420805f5d416ca55ed79497fd28f20216 (diff) |
Revert "Merge pull request #15739 from vespa-engine/revert-15734-bratseth/simplify-config-take-2"
This reverts commit d1e33a9420805f5d416ca55ed79497fd28f20216, reversing
changes made to 10464c859ccca2596e2b841612f8ea958330e4dc.
Diffstat (limited to 'container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java')
-rw-r--r-- | container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java b/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java index e6b0309981a..4751b9b74b7 100644 --- a/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java +++ b/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java @@ -51,7 +51,7 @@ public class ConfigRetrieverTest { public void require_that_bootstrap_configs_come_first() { writeConfigs(); ConfigRetriever retriever = createConfigRetriever(); - ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false); + ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0); assertThat(bootstrapConfigs, Matchers.instanceOf(BootstrapConfigs.class)); } @@ -61,7 +61,7 @@ public class ConfigRetrieverTest { public void require_that_components_comes_after_bootstrap() { writeConfigs(); ConfigRetriever retriever = createConfigRetriever(); - ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false); + ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0); ConfigKey<? extends ConfigInstance> testConfigKey = new ConfigKey<>(TestConfig.class, dirConfigSource.configId()); ConfigSnapshot componentsConfigs = retriever.getConfigs(Collections.singleton(testConfigKey), 0); @@ -73,22 +73,6 @@ public class ConfigRetrieverTest { } } - @Test - @SuppressWarnings("unused") - public void require_no_reconfig_when_restart_on_redeploy() { - // TODO - writeConfigs(); - ConfigRetriever retriever = createConfigRetriever(); - ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false); - - ConfigKey<? extends ConfigInstance> testConfigKey = new ConfigKey<>(TestConfig.class, dirConfigSource.configId()); - Optional<ConfigSnapshot> componentsConfigs = retriever.getConfigsOnce(Collections.singleton(testConfigKey), 0, true); - - if (componentsConfigs.isPresent()) { - fail("Expected no configs"); - } - } - @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -100,8 +84,8 @@ public class ConfigRetrieverTest { writeConfigs(); ConfigRetriever retriever = createConfigRetriever(); ConfigKey<? extends ConfigInstance> testConfigKey = new ConfigKey<>(TestConfig.class, dirConfigSource.configId()); - ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false); - ConfigSnapshot componentsConfigs = retriever.getConfigs(Collections.singleton(testConfigKey), 0, false); + ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0); + ConfigSnapshot componentsConfigs = retriever.getConfigs(Collections.singleton(testConfigKey), 0); Set<ConfigKey<? extends ConfigInstance>> keys = new HashSet<>(); keys.add(testConfigKey); keys.add(new ConfigKey<>(TestConfig.class, "")); |