SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#562 Changing tests into random server ports

Browse Source
This commit is contained in:
piomin
2020-06-26 15:31:01 +02:00
parent 8cbc391c0d
commit fa17d99a45
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTest.java
View File

@@ -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();
}
}

10
spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTest.java
View File

@@ -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();
}
}