diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-03-16 08:33:41 +0100 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2017-03-16 08:33:41 +0100 |
commit | 17fce38fee3e8e1c90f934e7d2088213f8e4d210 (patch) | |
tree | 7e1652cc06f9a0ba260fe5b983bda03f8ed1a105 /config-proxy | |
parent | 7889fa4f35a01ce9654efe561255fd11d1b055ed (diff) |
Simplify, we only care about the error config
Diffstat (limited to 'config-proxy')
-rw-r--r-- | config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java index 138c54a3a16..01733d0fd39 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java @@ -78,21 +78,17 @@ public class UpstreamConfigSubscriberTest { @Test public void require_that_error_response_is_handled() { - RawConfig fooConfig = Helper.fooConfig; - sourceResponses.put(fooConfig.getKey(), fooConfig); - // Create config with error based on fooConfig - generation++; + RawConfig fooConfig = Helper.fooConfig; ConfigPayload errorConfigPayload = new ConfigPayload(new Slime()); Payload errorPayload = Payload.from(errorConfigPayload); - ConfigKey<?> errorConfigKey = new ConfigKey<>("error", fooConfig.getConfigId(), fooConfig.getNamespace()); - RawConfig errorConfig = new RawConfig(errorConfigKey, fooConfig.getDefMd5(), errorPayload, + RawConfig errorConfig = new RawConfig(fooConfig.getKey(), fooConfig.getDefMd5(), errorPayload, ConfigUtils.getMd5(errorConfigPayload), generation, ErrorCode.UNKNOWN_DEFINITION, fooConfig.getDefContent(), Optional.empty()); + sourceResponses.put(fooConfig.getKey(), errorConfig); - sourceResponses.put(errorConfigKey, errorConfig); UpstreamConfigSubscriber subscriber = createUpstreamConfigSubscriber(errorConfig); - waitForConfigGeneration(clientUpdater, errorConfigKey, generation); + waitForConfigGeneration(clientUpdater, fooConfig.getKey(), generation); RawConfig lastConfig = clientUpdater.getLastConfig(); assertEquals(errorConfig, lastConfig); assertThat(lastConfig.errorCode(), is(ErrorCode.UNKNOWN_DEFINITION)); @@ -126,8 +122,8 @@ public class UpstreamConfigSubscriberTest { } while (Instant.now().isBefore(end)); assertNotNull(lastConfig); - assertThat(lastConfig.getGeneration(), is(expectedGeneration)); assertThat(lastConfig.getKey(), is(configKey)); + assertThat(lastConfig.getGeneration(), is(expectedGeneration)); } static class MockClientUpdater extends ClientUpdater { |