From fa17d99a45157b04798954c80a4ba0244b47af4d Mon Sep 17 00:00:00 2001 From: piomin Date: Fri, 26 Jun 2020 15:31:01 +0200 Subject: [PATCH] #562 Changing tests into random server ports --- .../loadbalancer/LoadBalancerAllNamespacesTest.java | 12 ++++++++---- .../kubernetes/loadbalancer/LoadBalancerTest.java | 10 +++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTest.java b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTest.java index 646c77c7..e4f69bd7 100644 --- a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTest.java +++ b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTest.java @@ -29,10 +29,11 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = { "spring.cloud.kubernetes.discovery.all-namespaces=true" }) @RunWith(SpringRunner.class) public class LoadBalancerAllNamespacesTest { @@ -40,6 +41,9 @@ public class LoadBalancerAllNamespacesTest { @Autowired RestTemplate restTemplate; + @LocalServerPort + int randomServerPort; + @ClassRule public static KubernetesServer server = new KubernetesServer(true, true); @@ -72,13 +76,13 @@ public class LoadBalancerAllNamespacesTest { client.services().inNamespace(namespace).createNew().withNewMetadata() .withName(name).withNamespace(namespace).endMetadata() .withSpec(new ServiceSpecBuilder().withPorts(new ServicePortBuilder() - .withProtocol("TCP").withPort(8080).build()).build()) + .withProtocol("TCP").withPort(randomServerPort).build()).build()) .done(); client.endpoints().inNamespace(namespace).createNew().withNewMetadata() .withName("service-a").withNamespace(namespace).endMetadata() .addNewSubset().addNewAddress().withIp("localhost").endAddress() - .addNewPort().withName("http").withPort(8080).endPort().endSubset() - .done(); + .addNewPort().withName("http").withPort(randomServerPort).endPort() + .endSubset().done(); } } diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTest.java b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTest.java index 036e69a0..1d34c2f3 100644 --- a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTest.java +++ b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTest.java @@ -29,16 +29,20 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @RunWith(SpringRunner.class) public class LoadBalancerTest { @Autowired RestTemplate restTemplate; + @LocalServerPort + int randomServerPort; + @ClassRule public static KubernetesServer server = new KubernetesServer(true, true); @@ -78,12 +82,12 @@ public class LoadBalancerTest { client.services().inNamespace(namespace).createNew().withNewMetadata() .withName(name).endMetadata() .withSpec(new ServiceSpecBuilder().withPorts(new ServicePortBuilder() - .withProtocol("TCP").withPort(8080).build()).build()) + .withProtocol("TCP").withPort(randomServerPort).build()).build()) .done(); client.endpoints().inNamespace(namespace).createNew().withNewMetadata() .withName("service-a").endMetadata().addNewSubset().addNewAddress() .withIp("localhost").endAddress().addNewPort().withName("http") - .withPort(8080).endPort().endSubset().done(); + .withPort(randomServerPort).endPort().endSubset().done(); } }