diff options
Diffstat (limited to 'configserver/src/test/java/com')
3 files changed, 1 insertions, 17 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java index a6f2eb38cc3..838b1b6b209 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java @@ -537,20 +537,6 @@ public class HostedDeployTest { assertEquals(Optional.of(ApplicationReindexing.empty() .withPending("music", "music", prepareResult.sessionId())), tester.tenant().getApplicationRepo().database().readReindexingStatus(tester.applicationId())); - - VespaModel model = ((VespaModel) tester.tenant().getSessionRepository() - .activeApplicationVersions(tester.applicationId()).get().get(Version.fromString("6.1.0")).get() - .getModel()); - - // Config for the container cluster to be restarted has been deferred until after restart. - ComponentsConfig.Builder builder1 = new ComponentsConfig.Builder(); - model.getContainerClusters().get("container").getContainers().get(0).getConfig(builder1); - assertTrue(builder1.getApplyOnRestart()); - - // Config for the metricsproxy cluster, which is not restarted, has not been deferred until after restart. - ComponentsConfig.Builder builder2 = new ComponentsConfig.Builder(); - model.getAdmin().getMetricsProxyCluster().getContainers().get(0).getConfig(builder2); - assertFalse(builder2.getApplyOnRestart()); } @Test diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializerTest.java index 085fecaea16..5ef143198e8 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/ActivationTriggersSerializerTest.java @@ -1,6 +1,5 @@ package com.yahoo.vespa.config.server.session; -import com.yahoo.config.provision.ClusterSpec.Id; import com.yahoo.vespa.config.server.session.ActivationTriggers.NodeRestart; import com.yahoo.vespa.config.server.session.ActivationTriggers.Reindexing; import org.junit.jupiter.api.Test; @@ -18,7 +17,6 @@ class ActivationTriggersSerializerTest { void testSerialization() { ActivationTriggers triggers = new ActivationTriggers(List.of(new NodeRestart("node1"), new NodeRestart("node2")), - List.of(Id.from("cluster1")), List.of(new Reindexing("cluster1", "type1"), new Reindexing("cluster1", "type2"), new Reindexing("cluster2", "type1"))); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java index e182c3f557b..2fe46868562 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java @@ -178,7 +178,7 @@ public class SessionZooKeeperClientTest { String data = Utf8.toString(curator.getData(path).get()); assertTrue(data.contains("{\"applicationId\":\"default:default:default\",\"applicationPackageReference\":\"foo\",\"version\":\"8.195.1\",\"createTime\":")); assertTrue(data.contains(",\"tenantSecretStores\":[],\"operatorCertificates\":[],\"dataplaneTokens\":[]," + - "\"activationTriggers\":{\"nodeRestarts\":[],\"restartingClusters\":[],\"reindexings\":[]}")); + "\"activationTriggers\":{\"nodeRestarts\":[],\"reindexings\":[]}")); } private void assertApplicationIdParse(long sessionId, String idString, String expectedIdString) { |