diff options
author | Martin Polden <martin.polden@gmail.com> | 2017-04-03 15:47:22 +0200 |
---|---|---|
committer | Martin Polden <martin.polden@gmail.com> | 2017-04-04 08:33:18 +0200 |
commit | 0600de82408eba591a1ee35a69d5acfe5c682794 (patch) | |
tree | 8862d2676e6b0b156ce5195b7113b71132875eb9 /config-provisioning/src/test/java/com | |
parent | 7f4eb92c847daea4148624407ea162268a7b8cdb (diff) |
Persist wanted Vespa version in node-repository
Diffstat (limited to 'config-provisioning/src/test/java/com')
-rw-r--r-- | config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java | 14 | ||||
-rw-r--r-- | config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java | 8 |
2 files changed, 9 insertions, 13 deletions
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java index 7cf0abecc2d..56da6dbcaa7 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java @@ -2,12 +2,12 @@ package com.yahoo.config.provision; import org.junit.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; import java.util.Optional; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author bratseth @@ -16,24 +16,24 @@ public class ClusterMembershipTest { @Test public void testContainerServiceInstance() { - ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"), Optional.empty()); + ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"), Optional.empty()); assertContainerService(ClusterMembership.from(cluster, 3)); } @Test public void testContainerServiceInstanceFromString() { - assertContainerService(ClusterMembership.from("container/id1/3", Optional.empty())); + assertContainerService(ClusterMembership.fromVersion("container/id1/3", Optional.empty())); } @Test public void testServiceInstance() { - ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Optional.empty()); + ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Optional.empty()); assertContentService(ClusterMembership.from(cluster, 37)); } @Test public void testServiceInstanceFromString() { - assertContentService(ClusterMembership.from("content/id1/37", Optional.empty())); + assertContentService(ClusterMembership.fromVersion("content/id1/37", Optional.empty())); } @Test @@ -50,7 +50,7 @@ public class ClusterMembershipTest { @Test public void testServiceInstanceWithRetire() { - ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Optional.empty()); + ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Optional.empty()); assertContentServiceWithRetire(ClusterMembership.retiredFrom(cluster, 37)); } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java index b4239f2b3bd..52b4f6853b8 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java @@ -10,10 +10,6 @@ import java.util.Optional; import java.util.Set; import static org.junit.Assert.assertEquals; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -25,7 +21,7 @@ public class ProvisionInfoTest { private final HostSpec h1 = new HostSpec("host1", Optional.empty()); private final HostSpec h2 = new HostSpec("host2", Optional.empty()); private final HostSpec h3 = new HostSpec("host3", Optional.of(ClusterMembership.from("container/test/0", Optional.empty()))); - private final HostSpec h4 = new HostSpec("host4", Optional.of(ClusterMembership.from("container/test/1", Optional.of("dockerImg")))); + private final HostSpec h4 = new HostSpec("host4", Optional.of(ClusterMembership.from("container/test/1", Optional.of("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.1")))); @Test public void testProvisionInfoSerialization() throws IOException { @@ -61,7 +57,7 @@ public class ProvisionInfoTest { assertTrue(serializedInfo.getHosts().contains(h4)); assertTrue(!getHost(h1.hostname(), serializedInfo.getHosts()).membership().isPresent()); assertEquals("container/test/0", getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().stringValue()); - assertEquals("dockerImg", getHost(h4.hostname(), serializedInfo.getHosts()).membership().get().cluster().dockerImage().get()); + assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.1", getHost(h4.hostname(), serializedInfo.getHosts()).membership().get().cluster().dockerImage().get()); } private HostSpec getHost(String hostname, Set<HostSpec> hosts) { |